Merge pull request #3133 from MahApps/feature/WindowButtonCommands_Wi…

…n10_CloseButton_Style Use the original Win 10 close button style
MahApps · Dec 30, 2017 · 89b57f7 · 89b57f7
2 parents 478b5e2 + df0cdc4
commit 89b57f7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -419,6 +419,18 @@
         <Setter Property="MaxHeight" Value="34" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Width" Value="34" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource SemiTransparentWhiteBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundDisabledBrush}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <!--  dark button style for min, max and close window buttons  -->
@@ -439,6 +451,40 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="MahApps.Metro.Styles.WindowButton.Close.Light.Win10"
+           BasedOn="{StaticResource LightMetroWindowButtonStyle}"
+           TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#E81123" />
+            </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 IdealForegroundDisabledBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Metro.Styles.WindowButton.Close.Dark.Win10"
+           BasedOn="{StaticResource DarkMetroWindowButtonStyle}"
+           TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#E81123" />
+            </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 DarkIdealForegroundDisabledBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
     <!--  style for default button  -->
     <Style x:Key="MahApps.Metro.Styles.MetroButton" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource GrayBrush10}" />

diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -211,6 +211,8 @@
     <Style x:Key="MahApps.Metro.Styles.WindowButtonCommands.Win10"
            BasedOn="{StaticResource MahApps.Metro.Styles.WindowButtonCommands}"
            TargetType="{x:Type Controls:WindowButtonCommands}">
+        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Dark.Win10}" />
+        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Light.Win10}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
     </Style>