From 8d077d5e796b4325e7b4ec8b22d01170602febe6 Mon Sep 17 00:00:00 2001
From: Mato <mato88@web.de>
Date: Wed, 29 Oct 2014 16:38:00 +0100
Subject: [PATCH 1/3] Changes for PR #1600 and PR #1611

---
 MahApps.Metro/Styles/Clean/CleanWindow.xaml | 37 ++++++++++++++++++++-
 MahApps.Metro/Styles/Controls.Buttons.xaml  |  4 ++-
 MahApps.Metro/Themes/MetroWindow.xaml       | 12 +++----
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/MahApps.Metro/Styles/Clean/CleanWindow.xaml b/MahApps.Metro/Styles/Clean/CleanWindow.xaml
index a7841eac20..74fef0d85e 100644
--- a/MahApps.Metro/Styles/Clean/CleanWindow.xaml
+++ b/MahApps.Metro/Styles/Clean/CleanWindow.xaml
@@ -108,7 +108,6 @@
                                                    Grid.Column="4"
                                                    Grid.RowSpan="2"
                                                    VerticalAlignment="Top"
-                                                   Foreground="{DynamicResource BlackColorBrush}"
                                                    Height="{Binding TitlebarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 
                     <!-- the main window content -->
@@ -239,6 +238,7 @@
     <Style TargetType="{x:Type Controls:MetroWindow}"
            BasedOn="{StaticResource {x:Type Controls:MetroWindow}}"
            x:Key="CleanWindowStyleKey">
+        
         <Setter Property="ShowTitleBar"
                 Value="True" />
         <Setter Property="MinWidth"
@@ -249,6 +249,41 @@
                 Value="{DynamicResource BlackBrush}" />
         <Setter Property="OverrideDefaultWindowCommandsBrush"
                 Value="{DynamicResource BlackBrush}" />
+        <Setter Property="WindowMinButtonStyle"
+                Value="{DynamicResource CleanWindowButtonStyle}" />
+        <Setter Property="WindowMaxButtonStyle"
+                Value="{DynamicResource CleanWindowButtonStyle}" />
+        <Setter Property="WindowCloseButtonStyle"
+                Value="{DynamicResource CleanCloseWindowButtonStyle}" />
+        
     </Style>
 
+    <Style x:Key="CleanWindowButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource MetroWindowButtonStyle}">
+
+        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+
+        <Style.Triggers>
+
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#EEEEEE" />
+            </Trigger>
+
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="CleanCloseWindowButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource CleanWindowButtonStyle}">
+        <Style.Triggers>
+
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#EB2F2F" />
+            </Trigger>
+
+        </Style.Triggers>
+    </Style>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Controls.Buttons.xaml b/MahApps.Metro/Styles/Controls.Buttons.xaml
index 6d7f4ab947..f2f4a8ac55 100644
--- a/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -215,7 +215,7 @@
         <Setter Property="Background"
                 Value="{DynamicResource TransparentWhiteBrush}" />
         <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                Value="{DynamicResource IdealForegroundColorBrush}" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Center" />
         <Setter Property="VerticalContentAlignment"
@@ -261,6 +261,8 @@
                      Value="True">
                 <Setter Property="Background"
                         Value="{DynamicResource HighlightBrush}" />
+                <Setter Property="Foreground" 
+                        Value="White" />
             </Trigger>
             <Trigger Property="IsEnabled"
                      Value="false">
diff --git a/MahApps.Metro/Themes/MetroWindow.xaml b/MahApps.Metro/Themes/MetroWindow.xaml
index 6e32d57f93..c6643b8000 100644
--- a/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/MahApps.Metro/Themes/MetroWindow.xaml
@@ -507,7 +507,6 @@
                                 Focusable="False"
                                 Height="{Binding TitlebarHeight, Mode=OneWay, RelativeSource={RelativeSource AncestorType=Controls:MetroWindow}}"
                                 Style="{Binding WindowMinButtonStyle, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}"
-                                Foreground="{TemplateBinding Foreground}"
                                 ToolTip="{Binding Minimize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowButtonCommands}}}">
                             <Button.Visibility>
                                 <MultiBinding Converter="{x:Static conv:ResizeModeMinMaxButtonVisibilityConverter.Instance}"
@@ -522,14 +521,13 @@
                             </Button.Visibility>
                             <Path Data="F1M0,6L0,9 9,9 9,6 0,6z"
                                   SnapsToDevicePixels="True"
-                                  Fill="{TemplateBinding Foreground}" />
+                                  Fill="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType=Button}}" />
                         </Button>
 
                         <Button x:Name="PART_Max"
                                 Focusable="False"
                                 Height="{Binding TitlebarHeight, Mode=OneWay, RelativeSource={RelativeSource AncestorType=Controls:MetroWindow}}"
                                 Style="{Binding WindowMaxButtonStyle, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}"
-                                Foreground="{TemplateBinding Foreground}"
                                 ToolTip="{Binding Maximize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowButtonCommands}}}">
                             <Button.Visibility>
                                 <MultiBinding Converter="{x:Static conv:ResizeModeMinMaxButtonVisibilityConverter.Instance}"
@@ -543,20 +541,20 @@
                                 </MultiBinding>
                             </Button.Visibility>
                             <Path x:Name="MaxPath" SnapsToDevicePixels="True"
-                                  Fill="{TemplateBinding Foreground}" >
+                                  Fill="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType=Button}}" >
                             </Path>
                         </Button>
 
                         <Button x:Name="PART_Close"
                                 Focusable="False"
+                                RenderOptions.EdgeMode="Aliased"
                                 Height="{Binding TitlebarHeight, Mode=OneWay, RelativeSource={RelativeSource AncestorType=Controls:MetroWindow}}"
                                 Style="{Binding WindowCloseButtonStyle, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}"
-                                Foreground="{TemplateBinding Foreground}"
                                 ToolTip="{Binding Close, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowButtonCommands}}}"
                                 Visibility="{Binding ShowCloseButton, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <Path Data="F1M0,0L2,0 5,3 8,0 10,0 6,4 10,8 8,8 5,5 2,8 0,8 4,4 0,0z"
+                            <Path Data="M 10.009,1.704 L 8.331,0.026 5.03,3.327 1.703,0 0,1.704 3.326,5.031 0.025,8.332 1.703,10.009 5.004,6.708 8.305,10.009 10.009,8.305 6.708,5.005"
                                   SnapsToDevicePixels="True"
-                                  Fill="{TemplateBinding Foreground}" />
+                                  Fill="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType=Button}}" />
                         </Button>
                     </StackPanel>
                     <ControlTemplate.Triggers>

From d6de3cbefe857d35356ca67de5c5cc2e0d2f08e2 Mon Sep 17 00:00:00 2001
From: Mato <mato88@web.de>
Date: Wed, 29 Oct 2014 20:59:47 +0100
Subject: [PATCH 2/3] fix vs window button command style

---
 MahApps.Metro/Styles/VS/Window.xaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/MahApps.Metro/Styles/VS/Window.xaml b/MahApps.Metro/Styles/VS/Window.xaml
index 39b4de93d1..1d66a51b8c 100644
--- a/MahApps.Metro/Styles/VS/Window.xaml
+++ b/MahApps.Metro/Styles/VS/Window.xaml
@@ -11,6 +11,26 @@
                 Value="{DynamicResource WindowGlowBrush}" />
         <Setter Property="TitleForeground"
                 Value="{DynamicResource WindowTitleForeground}" />
+        <Setter Property="WindowMinButtonStyle"
+                Value="{DynamicResource VSWindowButtonStyle}" />
+        <Setter Property="WindowMaxButtonStyle"
+                Value="{DynamicResource VSWindowButtonStyle}" />
+        <Setter Property="WindowCloseButtonStyle"
+                Value="{DynamicResource VSWindowButtonStyle}" />
+    </Style>
+
+    <Style x:Key="VSWindowButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource MetroWindowButtonStyle}">
+
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+
+        <Style.Triggers>
+
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+
+        </Style.Triggers>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file

From 40cf47495dbb68f955a47e15329081351dc52390 Mon Sep 17 00:00:00 2001
From: Mato <mato88@web.de>
Date: Sun, 2 Nov 2014 19:49:23 +0100
Subject: [PATCH 3/3] fix foreground for flyout

---
 MahApps.Metro/Styles/Clean/CleanWindow.xaml | 6 ------
 MahApps.Metro/Styles/Controls.Buttons.xaml  | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/MahApps.Metro/Styles/Clean/CleanWindow.xaml b/MahApps.Metro/Styles/Clean/CleanWindow.xaml
index 74fef0d85e..668f10a74b 100644
--- a/MahApps.Metro/Styles/Clean/CleanWindow.xaml
+++ b/MahApps.Metro/Styles/Clean/CleanWindow.xaml
@@ -260,14 +260,8 @@
 
     <Style x:Key="CleanWindowButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource MetroWindowButtonStyle}">
 
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
-
         <Style.Triggers>
 
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#EEEEEE" />
-            </Trigger>
-
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
                 <Setter Property="Foreground" Value="White" />
diff --git a/MahApps.Metro/Styles/Controls.Buttons.xaml b/MahApps.Metro/Styles/Controls.Buttons.xaml
index a51a86d9a8..809a1579f2 100644
--- a/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -216,7 +216,7 @@
         <Setter Property="Background"
                 Value="{DynamicResource TransparentWhiteBrush}" />
         <Setter Property="Foreground"
-                Value="{DynamicResource IdealForegroundColorBrush}" />
+                Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Center" />
         <Setter Property="VerticalContentAlignment"
@@ -249,15 +249,20 @@
                                     Value=".5" />
                         </Trigger>
                     </ControlTemplate.Triggers>
+                    
                 </ControlTemplate>
+
             </Setter.Value>
         </Setter>
+        
         <Style.Triggers>
+
             <Trigger Property="IsMouseOver"
                      Value="True">
                 <Setter Property="Background"
                         Value="{DynamicResource SemiTransparentWhiteBrush}" />
             </Trigger>
+            
             <Trigger Property="IsPressed"
                      Value="True">
                 <Setter Property="Background"