Refine window style

Kinnara · Dec 16, 2019 · f598eab · f598eab
1 parent 83ed673
commit f598eab
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/ModernWpf.SampleApp/WindowWithCustomTitleBar.xaml b/ModernWpf.SampleApp/WindowWithCustomTitleBar.xaml
@@ -28,11 +28,9 @@
         </Style>
         <Style x:Key="AppTitleBarButtonStyle" TargetType="ui:TitleBarButton">
             <Setter Property="IsActive" Value="{Binding IsActive, ElementName=Window}" />
-            <Setter Property="InactiveForeground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
         </Style>
         <Style x:Key="AppTitleBarBackButtonStyle" TargetType="ui:TitleBarButton" BasedOn="{StaticResource TitleBarBackButtonStyle}">
             <Setter Property="IsActive" Value="{Binding IsActive, ElementName=Window}" />
-            <Setter Property="InactiveForeground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
         </Style>
     </Window.Resources>
 

diff --git a/ModernWpf/Styles/Window.xaml b/ModernWpf/Styles/Window.xaml
@@ -36,7 +36,7 @@
         <Setter Property="local:TitleBar.Background" Value="Transparent" />
         <Setter Property="local:TitleBar.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="local:TitleBar.InactiveBackground" Value="Transparent" />
-        <Setter Property="local:TitleBar.InactiveForeground" Value="{DynamicResource SystemControlForegroundChromeDisabledLowBrush}" />
+        <Setter Property="local:TitleBar.InactiveForeground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
         <Setter Property="local:TitleBar.BackButtonStyle" Value="{StaticResource TitleBarBackButtonStyle}" />
         <Setter Property="Template">
             <Setter.Value>

diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
@@ -1251,8 +1251,8 @@
     <m:StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
 
     <!-- Resources for Window -->
-    <SolidColorBrush x:Key="WindowBorder" Color="{m:StaticColor SystemChromeGrayColor}" />
-    <SolidColorBrush x:Key="WindowBorderInactive" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="WindowBorder" Color="#FF707070" />
+    <SolidColorBrush x:Key="WindowBorderInactive" Color="#FF555555" />
     <SolidColorBrush x:Key="TitleBarButtonBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TitleBarButtonBackgroundInactive" Color="Transparent" />
 

diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
@@ -1251,8 +1251,8 @@
     <m:StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
 
     <!-- Resources for Window -->
-    <SolidColorBrush x:Key="WindowBorder" Color="{m:StaticColor SystemChromeGrayColor}" />
-    <SolidColorBrush x:Key="WindowBorderInactive" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="WindowBorder" Color="#FF707070" />
+    <SolidColorBrush x:Key="WindowBorderInactive" Color="#FFAAAAAA" />
     <SolidColorBrush x:Key="TitleBarButtonBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TitleBarButtonBackgroundInactive" Color="Transparent" />
 

diff --git a/ModernWpf/TitleBar/TitleBarButton.xaml b/ModernWpf/TitleBar/TitleBarButton.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource TitleBarButtonBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="InactiveBackground" Value="{DynamicResource TitleBarButtonBackgroundInactive}" />
-        <Setter Property="InactiveForeground" Value="{DynamicResource SystemControlForegroundChromeDisabledLowBrush}" />
+        <Setter Property="InactiveForeground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
         <Setter Property="HoverBackground" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
         <Setter Property="HoverForeground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
         <Setter Property="PressedBackground" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />