From 31cacc0ce5b2f8e4ba0b333781149113e7ffc165 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Thu, 18 Feb 2021 20:54:22 +0330
Subject: [PATCH 1/2] Update Window.xaml

---
 src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
index 5a38aa8c..ff1b11f7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
@@ -160,6 +160,9 @@
                             <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}"/>
                             <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Trigger>
+                        <Trigger Property="WindowStyle" Value="None">
+                            <Setter Property="ShowNonClientArea" Value="False"/>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
@@ -239,4 +242,4 @@
         </Style.Triggers>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 2a2e69692067582df3d99d732a7d95a0a71d815a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 25 Feb 2021 21:04:02 +0800
Subject: [PATCH 2/2] sync with net40

---
 src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml | 3 +++
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml         | 3 +++
 src/Shared/HandyControl_Shared/Themes/Theme.xaml         | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
index 4f5346e3..b7f8decd 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
@@ -162,6 +162,9 @@
                             <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}"/>
                             <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Trigger>
+                        <Trigger Property="WindowStyle" Value="None">
+                            <Setter Property="ShowNonClientArea" Value="False"/>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 44de2676..9dbdf195 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -4290,6 +4290,9 @@
 							<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
 							<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
 						</Trigger>
+						<Trigger Property="WindowStyle" Value="None">
+							<Setter Property="ShowNonClientArea" Value="False" />
+						</Trigger>
 						<MultiTrigger>
 							<MultiTrigger.Conditions>
 								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 4df439e6..6f5f0536 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -4289,6 +4289,9 @@
 							<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
 							<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
 						</Trigger>
+						<Trigger Property="WindowStyle" Value="None">
+							<Setter Property="ShowNonClientArea" Value="False" />
+						</Trigger>
 						<MultiTrigger>
 							<MultiTrigger.Conditions>
 								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />