misc

Ruben2776 · Jul 30, 2020 · 0969e5a · 0969e5a
1 parent 652acf5
commit 0969e5a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/PicView/ConfigureSettings/ConfigColors.cs b/PicView/ConfigureSettings/ConfigColors.cs
@@ -33,7 +33,7 @@ internal static void UpdateColor(bool remove = false)
         {
             if (remove)
             {
-                Application.Current.Resources["WindowBorderColorBrush"] = Brushes.Black;
+                Application.Current.Resources["WindowBorderColorBrush"] = Application.Current.Resources["WindowBackgroundColorBrush"];
                 return;
             }
 

diff --git a/PicView/PicGallery/GalleryClick.cs b/PicView/PicGallery/GalleryClick.cs
@@ -1,5 +1,4 @@
 using PicView.ChangeImage;
-using PicView.UILogic.Animations;
 using PicView.UILogic.Loading;
 using PicView.UILogic.Sizing;
 using System;

diff --git a/PicView/Themes/Styles/Border.xaml b/PicView/Themes/Styles/Border.xaml
@@ -5,6 +5,7 @@
         <Setter Property="Width" Value="120" />
         <Setter Property="CornerRadius" Value="2" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}" />
         <Setter Property="Effect" Value="{StaticResource MenuShadowButtonBorder}" />
         <Setter Property="Background" Value="{StaticResource BackgroundColorBrushAlt}" />

diff --git a/PicView/Themes/Styles/MyWindowStyle.xaml b/PicView/Themes/Styles/MyWindowStyle.xaml
@@ -8,7 +8,7 @@
                     <Border
                         x:Name="WindowBorder"
                         Margin="0"
-                        Background="{StaticResource WindowBorderColorBrushDefault}">
+                        Background="{StaticResource WindowBackgroundColorBrush}">
                         <Grid>
                             <Border BorderThickness="1">
                                 <AdornerDecorator>

diff --git a/PicView/Themes/Styles/RadioButton.xaml b/PicView/Themes/Styles/RadioButton.xaml
@@ -85,6 +85,7 @@
         <Setter Property="FontFamily" Value="/PicView;component/Themes/Resources/fonts/#Roboto Medium" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="Effect" Value="{StaticResource MenuShadowButtonBorder}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -249,6 +250,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FontFamily" Value="/PicView;component/Themes/Resources/fonts/#TeX Gyre Heros" />
         <Setter Property="FontSize" Value="14" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
             <Setter.Value>

diff --git a/PicView/Views/Windows/SettingsWindow.xaml b/PicView/Views/Windows/SettingsWindow.xaml
@@ -239,7 +239,8 @@
                             BorderBrush="{StaticResource BorderBrush}"
                             BorderThickness="1"
                             CornerRadius="2"
-                            Effect="{StaticResource MenuShadowButtonBorder}">
+                            Effect="{StaticResource MenuShadowButtonBorder}"
+                            Focusable="False">
                             <CheckBox
                                 x:Name="DarkThemeRadio"
                                 HorizontalContentAlignment="Center"
@@ -262,7 +263,8 @@
                             BorderBrush="{StaticResource BorderBrush}"
                             BorderThickness="1"
                             CornerRadius="2"
-                            Effect="{StaticResource MenuShadowButtonBorder}">
+                            Effect="{StaticResource MenuShadowButtonBorder}"
+                            Focusable="False">
                             <CheckBox
                                 x:Name="LightThemeRadio"
                                 HorizontalContentAlignment="Center"
@@ -303,7 +305,8 @@
                             Margin="0,3,10,3"
                             Background="{StaticResource BackgroundColorBrushAlt}"
                             BorderBrush="{StaticResource BorderBrush}"
-                            BorderThickness="1">
+                            BorderThickness="1"
+                            Focusable="False">
                             <CheckBox
                                 x:Name="SubDirRadio"
                                 HorizontalContentAlignment="Center"
@@ -324,7 +327,8 @@
                             Margin="0,3,10,3"
                             Background="{StaticResource BackgroundColorBrushAlt}"
                             BorderBrush="{StaticResource BorderBrush}"
-                            BorderThickness="1">
+                            BorderThickness="1"
+                            Focusable="False">
                             <CheckBox
                                 x:Name="BorderRadio"
                                 HorizontalContentAlignment="Center"
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ internal static void UpdateColor(bool remove = false) @@
             {
                 if (remove)
                 {
-                    Application.Current.Resources["WindowBorderColorBrush"] = Brushes.Black;
+                    Application.Current.Resources["WindowBorderColorBrush"] = Application.Current.Resources["WindowBackgroundColorBrush"];
                     return;
                 }
@@ Expand Down @@