Theme updates

Ruben2776 · Oct 9, 2024 · a0e352f · a0e352f
1 parent a54634c
commit a0e352f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/src/PicView.Avalonia.MacOS/App.axaml.cs b/src/PicView.Avalonia.MacOS/App.axaml.cs
@@ -70,6 +70,7 @@ await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 Current.RequestedThemeVariant = SettingsHelper.Settings.Theme.Dark ? ThemeVariant.Dark : ThemeVariant.Light;
             }
+            
             _mainWindow = new MacMainWindow();
             desktop.MainWindow = _mainWindow;
         });

diff --git a/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml b/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml
@@ -56,7 +56,7 @@
                 <Animation Duration="{StaticResource ButtonHoverAnimationDuration}" IterationCount="1">
                     <KeyFrame>
                         <Setter Property="Background">
-                            <SolidColorBrush Color="{DynamicResource SecondaryBackgroundColor}" />
+                            <SolidColorBrush Color="Transparent" />
                         </Setter>
                         <Setter Property="BorderBrush">
                             <SolidColorBrush Color="{DynamicResource MainBorderColor}" />

diff --git a/src/PicView.Avalonia/PicViewTheme/Controls/Scrollbar.axaml b/src/PicView.Avalonia/PicViewTheme/Controls/Scrollbar.axaml
@@ -7,9 +7,10 @@
 
         <Style Selector="^:horizontal">
             <Setter Property="Height" Value="18" />
+            <Setter Property="Focusable" Value="False" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <Border Background="{DynamicResource SecondaryBackgroundColor}" UseLayoutRounding="False">
+                    <Border Background="{DynamicResource TertiaryBackgroundColor}" UseLayoutRounding="False">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                             <RepeatButton
                                 Background="Transparent"
@@ -156,13 +157,14 @@
             </Setter>
         </Style>
         <Style Selector="^ /template/ Thumb#thumb">
-            <Setter Property="Background" Value="{DynamicResource SecondaryBackgroundColor}" />
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" />
+            <Setter Property="BorderThickness" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate>
                         <Border
                             Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource MainBorderColor}"
+                            BorderBrush="{DynamicResource TertiaryBorderColor}"
                             BorderThickness="1" />
                     </ControlTemplate>
                 </Setter.Value>
@@ -195,7 +197,7 @@
         </Style>
 
         <Style Selector="^ /template/ RepeatButton &gt; Path">
-            <Setter Property="Fill" Value="{StaticResource SecondaryTextColor}" />
+            <Setter Property="Fill" Value="{TemplateBinding Foreground}" />
         </Style>
 
         <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">

diff --git a/src/PicView.Avalonia/PicViewTheme/ResourceDictionaries/MainColors.axaml b/src/PicView.Avalonia/PicViewTheme/ResourceDictionaries/MainColors.axaml
@@ -28,7 +28,7 @@
 
             <Color x:Key="MainBorderColor">#FF3A3A3A</Color>
             <Color x:Key="SecondaryBorderColor">#777</Color>
-            <Color x:Key="TertiaryBorderColor">#555</Color>
+            <Color x:Key="TertiaryBorderColor">#4B4B4B</Color>
 
             <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
 
@@ -73,22 +73,22 @@
 
             <Color x:Key="MainBackgroundColor">White</Color>
             <Color x:Key="SecondaryBackgroundColor">#1CFFFFFF</Color>
-            <Color x:Key="TertiaryBackgroundColor">#AC676767</Color>
+            <Color x:Key="TertiaryBackgroundColor">#FAA6A6A6</Color>
 
             <Color x:Key="DisabledBackgroundColor">#DE5B5B5B</Color>
             <Color x:Key="DisabledTextColor">#ACA1A1A1</Color>
 
             <Color x:Key="BackgroundHoverColor">#A2EEEEEE</Color>
 
-            <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
+            <Color x:Key="AltBackgroundHoverColor">#CDFFFFFF</Color>
             <Color x:Key="AltBackgroundColor">#A7FFFFFF</Color>
 
-            <Color x:Key="MainButtonBackgroundColor">#F1F2F2F2</Color>
+            <Color x:Key="MainButtonBackgroundColor">#fff</Color>
             <Color x:Key="SecondaryButtonBackgroundColor">#F1E1E1E1</Color>
 
             <Color x:Key="MainBorderColor">#78B5B5B5</Color>
             <Color x:Key="SecondaryBorderColor">#95B5B5B5</Color>
-            <Color x:Key="TertiaryBorderColor">#77FFFFFF</Color>
+            <Color x:Key="TertiaryBorderColor">#77D8D8D8</Color>
 
             <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
 

diff --git a/src/PicView.Avalonia/Views/UC/Menus/SettingsMenu.axaml b/src/PicView.Avalonia/Views/UC/Menus/SettingsMenu.axaml
@@ -34,7 +34,7 @@
                     Background="Transparent"
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
-                    Classes="hover"
+                    Classes="altHover"
                     Command="{Binding ShowSettingsWindowCommand}"
                     CornerRadius="8,0,0,0"
                     Height="46"
@@ -66,7 +66,7 @@
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
                     Canvas.Left="179"
-                    Classes="hover"
+                    Classes="altHover"
                     Command="{CompiledBinding ShowAboutWindowCommand}"
                     Height="46"
                     ToolTip.Tip="{CompiledBinding AboutWindow,