From 2ae54582b6969e240eba083cfd017d0b50c56d36 Mon Sep 17 00:00:00 2001
From: "KEVIN-ALIEN\\kevin" <kevin_loddewykx@hotmail.be>
Date: Fri, 27 Jan 2017 22:33:30 +0100
Subject: [PATCH 1/2] -Hide Minimize, Maximize and Restore(shows up when
 WindowState is set to Maximized) when ResizeMode is NoResize -Added fix for
 when WindowState is Maximized and ResizeMode is NoResize, when both were set
 before you could start dragging the window and it would snap to the size of
 MinWidth and MinHeight

---
 .../Assets/ModernWindowStyles.xaml             |  7 ++++++-
 .../Themes/ModernWindow.xaml                   | 18 +++++++++++++++++-
 .../Assets/ModernWindowStyles.xaml             |  7 ++++++-
 .../Themes/ModernWindow.xaml                   | 18 +++++++++++++++++-
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
index 03d82586..72cb9f91 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
@@ -67,7 +67,7 @@
 
                                         <!-- window system buttons-->
                                         <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" shell:WindowChrome.IsHitTestVisibleInChrome="True">
-                                            <Button Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
+                                            <Button x:Name="Minimize" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
                                                 <Button.Content>
                                                     <Grid Width="13" Height="12" RenderTransform="1,0,0,1,0,1">
                                                         <Path Data="M0,6 L8,6 Z" Width="8" Height="7" VerticalAlignment="Center" HorizontalAlignment="Center"
@@ -130,6 +130,11 @@
                             <Setter TargetName="Maximize" Property="Visibility" Value="Visible" />
                             <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="ResizeMode" Value="NoResize">
+                            <Setter TargetName="Maximize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Minimize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Themes/ModernWindow.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Themes/ModernWindow.xaml
index 4b052705..d3d4da7e 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Themes/ModernWindow.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Themes/ModernWindow.xaml
@@ -100,7 +100,7 @@
 
                                         <!-- window system buttons-->
                                         <StackPanel Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Top" shell:WindowChrome.IsHitTestVisibleInChrome="True">
-                                            <Button Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
+                                            <Button x:Name="Minimize" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
                                                 <Button.Content>
                                                     <Grid Width="13" Height="12" RenderTransform="1,0,0,1,0,1">
                                                         <Path Data="M0,6 L8,6 Z" Width="8" Height="7" VerticalAlignment="Center" HorizontalAlignment="Center"
@@ -187,6 +187,11 @@
                             <Setter TargetName="Maximize" Property="Visibility" Value="Visible" />
                             <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="ResizeMode" Value="NoResize">
+                            <Setter TargetName="Maximize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Minimize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
@@ -204,6 +209,17 @@
                 <shell:WindowChrome CornerRadius="0" GlassFrameThickness="1" UseAeroCaptionButtons="False"  NonClientFrameEdges="None" />
             </Setter.Value>
         </Setter>
+
+        <Setter Property="shell:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="ResizeMode" Value="NoResize" />
+                    <Condition Property="WindowState" Value="Maximized" />
+                </MultiTrigger.Conditions>
+                <Setter Property="shell:WindowChrome.IsHitTestVisibleInChrome" Value="True"/>
+            </MultiTrigger>
+        </Style.Triggers>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
index 2fee842c..230ed4b7 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
@@ -66,7 +66,7 @@
 
                                         <!-- window system buttons-->
                                         <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" WindowChrome.IsHitTestVisibleInChrome="True">
-                                            <Button Command="{Binding Source={x:Static SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
+                                            <Button x:Name="Minimize" Command="{Binding Source={x:Static SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
                                                 <Button.Content>
                                                     <Grid Width="13" Height="12" RenderTransform="1,0,0,1,0,1">
                                                         <Path Data="M0,6 L8,6 Z" Width="8" Height="7" VerticalAlignment="Center" HorizontalAlignment="Center"
@@ -129,6 +129,11 @@
                             <Setter TargetName="Maximize" Property="Visibility" Value="Visible" />
                             <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="ResizeMode" Value="NoResize">
+                            <Setter TargetName="Maximize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Minimize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Themes/ModernWindow.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Themes/ModernWindow.xaml
index 9db7dbf2..c0499b20 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Themes/ModernWindow.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Themes/ModernWindow.xaml
@@ -99,7 +99,7 @@
 
                                         <!-- window system buttons-->
                                         <StackPanel Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Top" WindowChrome.IsHitTestVisibleInChrome="True">
-                                            <Button Command="{Binding Source={x:Static SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
+                                            <Button x:Name="Minimize" Command="{Binding Source={x:Static SystemCommands.MinimizeWindowCommand}}" ToolTip="{x:Static modernui:Resources.Minimize}" Style="{StaticResource SystemButton}">
                                                 <Button.Content>
                                                     <Grid Width="13" Height="12" RenderTransform="1,0,0,1,0,1">
                                                         <Path Data="M0,6 L8,6 Z" Width="8" Height="7" VerticalAlignment="Center" HorizontalAlignment="Center"
@@ -186,6 +186,11 @@
                             <Setter TargetName="Maximize" Property="Visibility" Value="Visible" />
                             <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="ResizeMode" Value="NoResize">
+                            <Setter TargetName="Maximize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Minimize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Restore" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
@@ -203,6 +208,17 @@
                 <WindowChrome CornerRadius="0" GlassFrameThickness="1" UseAeroCaptionButtons="False" NonClientFrameEdges="None" />
             </Setter.Value>
         </Setter>
+
+        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="ResizeMode" Value="NoResize" />
+                    <Condition Property="WindowState" Value="Maximized" />
+                </MultiTrigger.Conditions>
+                <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True"/>
+            </MultiTrigger>
+        </Style.Triggers>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file

From df4393a42c545372644593ecf7293e9953c0f352 Mon Sep 17 00:00:00 2001
From: "KEVIN-ALIEN\\kevin" <kevin_loddewykx@hotmail.be>
Date: Wed, 1 Feb 2017 18:23:45 +0100
Subject: [PATCH 2/2] -Fixes BlankWindow style, close button location when
 noresize is active

---
 .../FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml     | 2 +-
 .../FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
index 72cb9f91..6e7fdc3b 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.WPF4/Assets/ModernWindowStyles.xaml
@@ -50,7 +50,7 @@
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="96" />
+                                            <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
 
                                         <!-- title -->
diff --git a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
index 230ed4b7..822b4998 100644
--- a/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
+++ b/1.0/FirstFloor.ModernUI/FirstFloor.ModernUI/Assets/ModernWindowStyles.xaml
@@ -49,7 +49,7 @@
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="96" />
+                                            <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
 
                                         <!-- title -->