Add option to edit highlight color

KyrietS · Oct 20, 2024 · 1e91db2 · 1e91db2
1 parent 7c299d5
commit 1e91db2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/LogAlligator.App/App.axaml b/src/LogAlligator.App/App.axaml
@@ -9,11 +9,11 @@
         <!--<ResourceInclude Source="/ThemeCustomizations.axaml" />-->
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
-  </Application.Resources> 
-  
+  </Application.Resources>
+
     <Application.Styles>
       <SimpleTheme />
-      
+
       <Styles>
         <Styles.Resources>
           <ResourceDictionary>
@@ -22,7 +22,7 @@
             </ResourceDictionary.MergedDictionaries>
           </ResourceDictionary>
         </Styles.Resources>
-          <StyleInclude Source="StyleCustomizations.axaml" />
+        <StyleInclude Source="StyleCustomizations.axaml" />
       </Styles>
     </Application.Styles>
 

diff --git a/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml b/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml
@@ -7,7 +7,7 @@
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
         Title="Edit highlight"
         Width="300"
-        Height="95"
+        Height="500"
         CanResize="False"
         ShowInTaskbar="False"
         ExtendClientAreaChromeHints="NoChrome"
@@ -21,6 +21,15 @@
         <TextBlock FontSize="{DynamicResource FontSizeNormal}">Edit highlight</TextBlock>
         <Separator Background="Transparent"/>
         <TextBox Name="HighlightPatternTextBox" Focusable="True" Watermark="Highlight pattern"/>
+        <ColorView Name="HighlightColorPicker"
+            IsAccentColorsVisible="False"
+            IsAlphaEnabled="False"
+            IsColorModelVisible="False"
+            IsColorComponentsVisible="False"
+            IsColorPaletteVisible="False"
+            IsComponentSliderVisible="False"
+            IsColorSpectrumVisible="True"
+            IsColorPreviewVisible="True"/>
         <Separator Height="6" Background="Transparent"/>
         <StackPanel Orientation="Horizontal" Spacing="5" HorizontalAlignment="Center">
             <Button Command="{Binding OnOkClick}" Width="60" IsDefault="True">OK</Button>

diff --git a/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml.cs b/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml.cs
@@ -19,6 +19,7 @@ public void Initialize(Highlight highlight)
     {
         _highlightToEdit = highlight;
         HighlightPatternTextBox.Text = highlight.Pattern.Pattern.ToString();
+        HighlightColorPicker.Color = highlight.Background;
     }
 
     public void OnEscape()
@@ -31,6 +32,7 @@ public void OnOkClick()
         if (!string.IsNullOrEmpty(HighlightPatternTextBox.Text))
         {
             _highlightToEdit!.Pattern.Pattern = HighlightPatternTextBox.Text.AsMemory();
+            _highlightToEdit!.Background = HighlightColorPicker.Color;
         }
 
         Close();

diff --git a/src/LogAlligator.App/LogAlligator.App.csproj b/src/LogAlligator.App/LogAlligator.App.csproj
@@ -18,6 +18,7 @@
     <ItemGroup>
         <!-- Avalonia -->
         <PackageReference Include="Avalonia" Version="11.2.0-beta1" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.0-beta1" />
         <PackageReference Include="Avalonia.Desktop" Version="11.2.0-beta1" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0-beta1" />
         <PackageReference Include="Avalonia.Themes.Simple" Version="11.2.0-beta1" />

diff --git a/src/LogAlligator.App/StyleCustomizations.axaml b/src/LogAlligator.App/StyleCustomizations.axaml
@@ -1,5 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml" />
+
     <Design.PreviewWith>
         <Border Width="400"
             Height="400">
@@ -8,7 +11,7 @@
                     <StackPanel>
                         <TextBlock>Hello world!</TextBlock>
                         <Button>Normal button</Button>
-                        <ToggleButton>Some text</ToggleButton>                        
+                        <ToggleButton>Some text</ToggleButton>
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="Panel2"></TabItem>