From 94097443e4421f81f09ee6445c7b84fc876a5566 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Tue, 29 Oct 2019 22:33:02 +0100
Subject: [PATCH] (GH-3623) Win10 styles for CleanWindow WindowButtonCommands

- Add new style `MahApps.Styles.Button.CleanWindow.Close.Light.Win10`
- Add new style `MahApps.Styles.Button.CleanWindow.Close.Dark.Win10`
- Add new style `MahApps.Styles.WindowButtonCommands.Clean.Win10`
---
 .../ExampleWindows/CleanWindowDemo.xaml       |  4 +++
 .../Clean/CleanWindowButtonCommands.xaml      |  8 +++++
 .../Styles/Clean/CleanWindowButtons.xaml      | 30 +++++++++++++++++++
 .../Styles/Controls.Buttons.xaml              | 16 +++-------
 .../Themes/WindowButtonCommands.xaml          |  4 ++-
 5 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index 903f7c0f1b..30c29f2a80 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -52,6 +52,10 @@
         </Controls:WindowCommands>
     </Controls:MetroWindow.RightWindowCommands>
 
+    <Controls:MetroWindow.WindowButtonCommands>
+        <Controls:WindowButtonCommands Style="{DynamicResource MahApps.Styles.WindowButtonCommands.Clean.Win10}" />
+    </Controls:MetroWindow.WindowButtonCommands>
+
     <Controls:MetroWindow.Flyouts>
         <Controls:FlyoutsControl>
             <Controls:Flyout x:Name="settingsFlyout"
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
index 8a15fd53cb..87f5e89925 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
@@ -18,4 +18,12 @@
         <Setter Property="LightMinButtonStyle" Value="{DynamicResource MahApps.Styles.Button.CleanWindow.Light}" />
     </Style>
 
+    <Style x:Key="MahApps.Styles.WindowButtonCommands.Clean.Win10"
+           BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Clean}"
+           TargetType="{x:Type Controls:WindowButtonCommands}">
+        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.CleanWindow.Close.Dark.Win10}" />
+        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.CleanWindow.Close.Light.Win10}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands.Win10}" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
index 337a42b8e1..7c3750dd98 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
@@ -71,4 +71,34 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="MahApps.Styles.Button.CleanWindow.Close.Light.Win10"
+           BasedOn="{StaticResource MahApps.Styles.Button.CleanWindow.Light}"
+           TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#E81123" />
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#F1707A" />
+                <Setter Property="Foreground" Value="Black" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.CleanWindow.Close.Dark.Win10"
+           BasedOn="{StaticResource MahApps.Styles.Button.CleanWindow.Dark}"
+           TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#E81123" />
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#F1707A" />
+                <Setter Property="Foreground" Value="Black" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 5545209893..e1c1e556c0 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -273,6 +273,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Opacity" Value="0.7" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
@@ -287,15 +288,9 @@
                                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                                    ContentTemplate="{TemplateBinding ContentTemplate}"
                                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   Opacity="0.6"
                                                    RecognizesAccessKey="True"
                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -303,6 +298,7 @@
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SemiTransparentWhite}" />
+                <Setter Property="Opacity" Value="1" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
@@ -362,14 +358,12 @@
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="#E81123" />
+                <Setter Property="Foreground" Value="White" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="#F1707A" />
                 <Setter Property="Foreground" Value="Black" />
             </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForegroundDisabled}" />
-            </Trigger>
         </Style.Triggers>
     </Style>
 
@@ -379,14 +373,12 @@
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="#E81123" />
+                <Setter Property="Foreground" Value="White" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="#F1707A" />
                 <Setter Property="Foreground" Value="Black" />
             </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DarkIdealForegroundDisabled}" />
-            </Trigger>
         </Style.Triggers>
     </Style>
 
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index f9f250c455..e57fa54182 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -190,7 +190,9 @@
                                  RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
-                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      UseLayoutRounding="False">
                     <Line SnapsToDevicePixels="True"
                           Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
                           X1="0"