diff --git a/HandyControl/Controls/Attach/WindowAttach.cs b/HandyControl/Controls/Attach/WindowAttach.cs
new file mode 100644
index 00000000..99909ec9
--- /dev/null
+++ b/HandyControl/Controls/Attach/WindowAttach.cs
@@ -0,0 +1,41 @@
+using System.Windows;
+using System.Windows.Input;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public static class WindowAttach
+    {
+        public static readonly DependencyProperty IsDragElementProperty = DependencyProperty.RegisterAttached(
+            "IsDragElement", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDragElementChanged));
+
+        public static void SetIsDragElement(DependencyObject element, bool value)
+            => element.SetValue(IsDragElementProperty, value);
+
+        public static bool GetIsDragElement(DependencyObject element)
+            => (bool) element.GetValue(IsDragElementProperty);
+
+        private static void OnIsDragElementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is UIElement ctl)
+            {
+                if ((bool)e.NewValue)
+                {
+                    ctl.MouseLeftButtonDown += DragElement_MouseLeftButtonDown; ;
+                }
+                else
+                {
+                    ctl.MouseLeftButtonDown -= DragElement_MouseLeftButtonDown;
+                }
+            }
+        }
+
+        private static void DragElement_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (sender is DependencyObject obj && e.ButtonState == MouseButtonState.Pressed)
+            {
+                System.Windows.Window.GetWindow(obj)?.DragMove();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Window/Window.cs b/HandyControl/Controls/Window/Window.cs
index daa24f1a..ee8d9fc1 100644
--- a/HandyControl/Controls/Window/Window.cs
+++ b/HandyControl/Controls/Window/Window.cs
@@ -6,17 +6,20 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
+using HandyControl.Tools.Extension;
 #if netle40
 using Microsoft.Windows.Shell;
 #else
 using System.Windows.Shell;
+
 #endif
 
 namespace HandyControl.Controls
 {
+    [TemplatePart(Name = ElementNonClientArea, Type = typeof(UIElement))]
     public class Window : System.Windows.Window
     {
-        private Thickness _tempThickness;
+        private const string ElementNonClientArea = "PART_NonClientArea";
 
         public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
             "NonClientAreaContent", typeof(object), typeof(Window), new PropertyMetadata(default(object)));
@@ -66,42 +69,38 @@ namespace HandyControl.Controls
             new PropertyMetadata(28.0));
 
         public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
-            "ShowNonClientArea", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.TrueBox));
+            "ShowNonClientArea", typeof(bool), typeof(Window),
+            new PropertyMetadata(ValueBoxes.TrueBox, OnShowNonClientAreaChanged));
 
         public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
             "ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox));
 
         public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
-            "IsFullScreen", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox,
-                (o, args) =>
-                {
-                    var ctl = (Window)o;
-                    var v = (bool)args.NewValue;
-                    if (v)
-                    {
-                        ctl.OriginState = ctl.WindowState;
-                        ctl.OriginStyle = ctl.WindowStyle;
-                        ctl.OriginResizeMode = ctl.ResizeMode;
-                        ctl.WindowStyle = WindowStyle.None;
-                        //下面三行不能改变，就是故意的
-                        ctl.WindowState = WindowState.Maximized;
-                        ctl.WindowState = WindowState.Minimized;
-                        ctl.WindowState = WindowState.Maximized;
-                    }
-                    else
-                    {
-                        ctl.WindowState = ctl.OriginState;
-                        ctl.WindowStyle = ctl.OriginStyle;
-                        ctl.ResizeMode = ctl.OriginResizeMode;
-                    }
-                }));
+            "IsFullScreen", typeof(bool), typeof(Window),
+            new PropertyMetadata(ValueBoxes.FalseBox, OnIsFullScreenChanged));
+
+        private bool _isFullScreen;
+
+        private UIElement _nonClientArea;
+
+        private bool _showNonClientArea = true;
+
+        private double _tempNonClientAreaHeight;
+
+        private Thickness _tempThickness;
+
+        private WindowState _tempWindowState;
+
+        private WindowStyle _tempWindowStyle;
+
+        private ResizeMode _tempResizeMode;
 
         public Window()
         {
             var chrome = new WindowChrome
             {
                 CornerRadius = new CornerRadius(),
-                GlassFrameThickness = new Thickness(1)
+                GlassFrameThickness = new Thickness(0, 0, 0, 1)
             };
             BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
                 new Binding(NonClientAreaHeightProperty.Name) {Source = this});
@@ -123,9 +122,192 @@ namespace HandyControl.Controls
                     (s, e) => WindowState = WindowState.Normal));
                 CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
                 CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
+
+                _tempNonClientAreaHeight = NonClientAreaHeight;
+                _tempWindowState = WindowState;
+                _tempWindowStyle = WindowStyle;
+                _tempResizeMode = ResizeMode;
+
+                SwitchIsFullScreen(_isFullScreen);
+                SwitchShowNonClientArea(_showNonClientArea);
             };
         }
 
+        public Brush CloseButtonBackground
+        {
+            get => (Brush) GetValue(CloseButtonBackgroundProperty);
+            set => SetValue(CloseButtonBackgroundProperty, value);
+        }
+
+        public Brush CloseButtonForeground
+        {
+            get => (Brush) GetValue(CloseButtonForegroundProperty);
+            set => SetValue(CloseButtonForegroundProperty, value);
+        }
+
+        public Brush OtherButtonBackground
+        {
+            get => (Brush) GetValue(OtherButtonBackgroundProperty);
+            set => SetValue(OtherButtonBackgroundProperty, value);
+        }
+
+        public Brush OtherButtonForeground
+        {
+            get => (Brush) GetValue(OtherButtonForegroundProperty);
+            set => SetValue(OtherButtonForegroundProperty, value);
+        }
+
+        public double NonClientAreaHeight
+        {
+            get => (double) GetValue(NonClientAreaHeightProperty);
+            set => SetValue(NonClientAreaHeightProperty, value);
+        }
+
+        public bool IsFullScreen
+        {
+            get => (bool) GetValue(IsFullScreenProperty);
+            set => SetValue(IsFullScreenProperty, value);
+        }
+
+        public object NonClientAreaContent
+        {
+            get => GetValue(NonClientAreaContentProperty);
+            set => SetValue(NonClientAreaContentProperty, value);
+        }
+
+        public Brush CloseButtonHoverBackground
+        {
+            get => (Brush) GetValue(CloseButtonHoverBackgroundProperty);
+            set => SetValue(CloseButtonHoverBackgroundProperty, value);
+        }
+
+        public Brush CloseButtonHoverForeground
+        {
+            get => (Brush) GetValue(CloseButtonHoverForegroundProperty);
+            set => SetValue(CloseButtonHoverForegroundProperty, value);
+        }
+
+        public Brush OtherButtonHoverBackground
+        {
+            get => (Brush) GetValue(OtherButtonHoverBackgroundProperty);
+            set => SetValue(OtherButtonHoverBackgroundProperty, value);
+        }
+
+        public Brush OtherButtonHoverForeground
+        {
+            get => (Brush) GetValue(OtherButtonHoverForegroundProperty);
+            set => SetValue(OtherButtonHoverForegroundProperty, value);
+        }
+
+        public Brush NonClientAreaBackground
+        {
+            get => (Brush) GetValue(NonClientAreaBackgroundProperty);
+            set => SetValue(NonClientAreaBackgroundProperty, value);
+        }
+
+        public Brush NonClientAreaForeground
+        {
+            get => (Brush) GetValue(NonClientAreaForegroundProperty);
+            set => SetValue(NonClientAreaForegroundProperty, value);
+        }
+
+        public bool ShowNonClientArea
+        {
+            get => (bool) GetValue(ShowNonClientAreaProperty);
+            set => SetValue(ShowNonClientAreaProperty, value);
+        }
+
+        public bool ShowTitle
+        {
+            get => (bool) GetValue(ShowTitleProperty);
+            set => SetValue(ShowTitleProperty, value);
+        }
+
+        private static void OnShowNonClientAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (Window) d;
+            ctl.SwitchShowNonClientArea((bool) e.NewValue);
+        }
+
+        private void SwitchShowNonClientArea(bool showNonClientArea)
+        {
+            if (_nonClientArea == null)
+            {
+                _showNonClientArea = showNonClientArea;
+                return;
+            }
+
+            if (showNonClientArea)
+            {
+                if (IsFullScreen)
+                {
+                    _nonClientArea.Show(false);
+                    _tempNonClientAreaHeight = NonClientAreaHeight;
+                    NonClientAreaHeight = 0;
+                }
+                else
+                {
+                    _nonClientArea.Show(true);
+                    NonClientAreaHeight = _tempNonClientAreaHeight;
+                }
+            }
+            else
+            {
+                _nonClientArea.Show(false);
+                _tempNonClientAreaHeight = NonClientAreaHeight;
+                NonClientAreaHeight = 0;
+            }
+        }
+
+        private static void OnIsFullScreenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (Window) d;
+            ctl.SwitchIsFullScreen((bool) e.NewValue);
+        }
+
+        private void SwitchIsFullScreen(bool isFullScreen)
+        {
+            if (_nonClientArea == null)
+            {
+                _isFullScreen = isFullScreen;
+                return;
+            }
+
+            if (isFullScreen)
+            {
+                _nonClientArea.Show(false);
+                _tempNonClientAreaHeight = NonClientAreaHeight;
+                NonClientAreaHeight = 0;
+
+                _tempWindowState = WindowState;
+                _tempWindowStyle = WindowStyle;
+                _tempResizeMode = ResizeMode;
+                WindowStyle = WindowStyle.None;
+                //下面三行不能改变，就是故意的
+                WindowState = WindowState.Maximized;
+                WindowState = WindowState.Minimized;
+                WindowState = WindowState.Maximized;
+            }
+            else
+            {
+                if (ShowNonClientArea)
+                {
+                    _nonClientArea.Show(true);
+                    NonClientAreaHeight = _tempNonClientAreaHeight;
+                }
+                else
+                {
+                    _nonClientArea.Show(false);
+                    _tempNonClientAreaHeight = NonClientAreaHeight;
+                    NonClientAreaHeight = 0;
+                }
+
+                WindowState = _tempWindowState;
+                WindowStyle = _tempWindowStyle;
+                ResizeMode = _tempResizeMode;
+            }
+        }
+
         protected override void OnStateChanged(EventArgs e)
         {
             base.OnStateChanged(e);
@@ -143,6 +325,8 @@ namespace HandyControl.Controls
         {
             base.OnApplyTemplate();
 
+            _nonClientArea = GetTemplateChild(ElementNonClientArea) as UIElement;
+
             if (SizeToContent != SizeToContent.WidthAndHeight)
                 return;
 
@@ -150,111 +334,6 @@ namespace HandyControl.Controls
             Dispatcher.BeginInvoke(new Action(() => { SizeToContent = SizeToContent.WidthAndHeight; }));
         }
 
-        public Brush CloseButtonBackground
-        {
-            get => (Brush)GetValue(CloseButtonBackgroundProperty);
-            set => SetValue(CloseButtonBackgroundProperty, value);
-        }
-
-        public Brush CloseButtonForeground
-        {
-            get => (Brush)GetValue(CloseButtonForegroundProperty);
-            set => SetValue(CloseButtonForegroundProperty, value);
-        }
-
-        public Brush OtherButtonBackground
-        {
-            get => (Brush)GetValue(OtherButtonBackgroundProperty);
-            set => SetValue(OtherButtonBackgroundProperty, value);
-        }
-
-        public Brush OtherButtonForeground
-        {
-            get => (Brush)GetValue(OtherButtonForegroundProperty);
-            set => SetValue(OtherButtonForegroundProperty, value);
-        }
-
-        /// <summary>
-        ///     原始状态
-        /// </summary>
-        private WindowState OriginState { get; set; }
-
-        /// <summary>
-        ///     原始样式
-        /// </summary>
-        private WindowStyle OriginStyle { get; set; }
-
-        /// <summary>
-        ///     原始尺寸调节模式
-        /// </summary>
-        private ResizeMode OriginResizeMode { get; set; }
-
-        public double NonClientAreaHeight
-        {
-            get => (double)GetValue(NonClientAreaHeightProperty);
-            set => SetValue(NonClientAreaHeightProperty, value);
-        }
-
-        public bool IsFullScreen
-        {
-            get => (bool)GetValue(IsFullScreenProperty);
-            set => SetValue(IsFullScreenProperty, value);
-        }
-
-        public object NonClientAreaContent
-        {
-            get => GetValue(NonClientAreaContentProperty);
-            set => SetValue(NonClientAreaContentProperty, value);
-        }
-
-        public Brush CloseButtonHoverBackground
-        {
-            get => (Brush)GetValue(CloseButtonHoverBackgroundProperty);
-            set => SetValue(CloseButtonHoverBackgroundProperty, value);
-        }
-
-        public Brush CloseButtonHoverForeground
-        {
-            get => (Brush)GetValue(CloseButtonHoverForegroundProperty);
-            set => SetValue(CloseButtonHoverForegroundProperty, value);
-        }
-
-        public Brush OtherButtonHoverBackground
-        {
-            get => (Brush)GetValue(OtherButtonHoverBackgroundProperty);
-            set => SetValue(OtherButtonHoverBackgroundProperty, value);
-        }
-
-        public Brush OtherButtonHoverForeground
-        {
-            get => (Brush)GetValue(OtherButtonHoverForegroundProperty);
-            set => SetValue(OtherButtonHoverForegroundProperty, value);
-        }
-
-        public Brush NonClientAreaBackground
-        {
-            get => (Brush)GetValue(NonClientAreaBackgroundProperty);
-            set => SetValue(NonClientAreaBackgroundProperty, value);
-        }
-
-        public Brush NonClientAreaForeground
-        {
-            get => (Brush)GetValue(NonClientAreaForegroundProperty);
-            set => SetValue(NonClientAreaForegroundProperty, value);
-        }
-
-        public bool ShowNonClientArea
-        {
-            get => (bool)GetValue(ShowNonClientAreaProperty);
-            set => SetValue(ShowNonClientAreaProperty, value);
-        }
-
-        public bool ShowTitle
-        {
-            get => (bool)GetValue(ShowTitleProperty);
-            set => SetValue(ShowTitleProperty, value);
-        }
-
         private void ShowSystemMenu(object sender, ExecutedRoutedEventArgs e)
         {
             var point = WindowState == WindowState.Maximized
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 77f6eba7..102d35b2 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -114,6 +114,7 @@
     </When>
   </Choose>
   <ItemGroup>
+    <Compile Include="Controls\Attach\WindowAttach.cs" />
     <Compile Include="Controls\Attach\LinkElement.cs" />
     <Compile Include="Controls\Attach\PanelElement.cs" />
     <Compile Include="Controls\Attach\VisualElement.cs" />
diff --git a/HandyControl/Properties/Langs/Lang.en.resx b/HandyControl/Properties/Langs/Lang.en.resx
index 162027ec..ee8c3009 100644
--- a/HandyControl/Properties/Langs/Lang.en.resx
+++ b/HandyControl/Properties/Langs/Lang.en.resx
@@ -53,7 +53,6 @@
     value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
-
     mimetype: application/x-microsoft.net.object.bytearray.base64
     value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
diff --git a/HandyControl/Themes/Styles/Window-net40.tt b/HandyControl/Themes/Styles/Window-net40.tt
index 0547b26d..4c0aec27 100644
--- a/HandyControl/Themes/Styles/Window-net40.tt
+++ b/HandyControl/Themes/Styles/Window-net40.tt
@@ -40,16 +40,16 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
               </Grid.RowDefinitions>
-              <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition/>
                   <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <StackPanel shell:WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MinimizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MaximizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.RestoreWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="shell:SystemCommands.CloseWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="shell:SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
                 </StackPanel>
                 <Grid Grid.Column="0">
                   <Grid.ColumnDefinitions>
@@ -107,9 +107,6 @@
               <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
               <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
             </Trigger>
-            <Trigger Property="ShowNonClientArea" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
-            </Trigger>
             <Trigger Property="ShowTitle" Value="False">
               <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
             </Trigger>
@@ -124,15 +121,6 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsFullScreen" Value="True">
-        <Setter Property="shell:WindowChrome.WindowChrome">
-          <Setter.Value>
-            <shell:WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
   </Style>
 
   <Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
diff --git a/HandyControl/Themes/Styles/Window-netgt40.tt b/HandyControl/Themes/Styles/Window-netgt40.tt
index df33c0aa..5568199b 100644
--- a/HandyControl/Themes/Styles/Window-netgt40.tt
+++ b/HandyControl/Themes/Styles/Window-netgt40.tt
@@ -39,16 +39,16 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
               </Grid.RowDefinitions>
-              <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition/>
                   <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
                 </StackPanel>
                 <Grid Grid.Column="0">
                   <Grid.ColumnDefinitions>
@@ -106,9 +106,6 @@
               <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
               <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
             </Trigger>
-            <Trigger Property="ShowNonClientArea" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
-            </Trigger>
             <Trigger Property="ShowTitle" Value="False">
               <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
             </Trigger>
@@ -123,15 +120,6 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsFullScreen" Value="True">
-        <Setter Property="WindowChrome.WindowChrome">
-          <Setter.Value>
-            <WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
   </Style>
 
   <Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
diff --git a/HandyControl/Themes/Styles/Window.xaml b/HandyControl/Themes/Styles/Window.xaml
index df33c0aa..5568199b 100644
--- a/HandyControl/Themes/Styles/Window.xaml
+++ b/HandyControl/Themes/Styles/Window.xaml
@@ -39,16 +39,16 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
               </Grid.RowDefinitions>
-              <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition/>
                   <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
+                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
                 </StackPanel>
                 <Grid Grid.Column="0">
                   <Grid.ColumnDefinitions>
@@ -106,9 +106,6 @@
               <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
               <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
             </Trigger>
-            <Trigger Property="ShowNonClientArea" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
-            </Trigger>
             <Trigger Property="ShowTitle" Value="False">
               <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
             </Trigger>
@@ -123,15 +120,6 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsFullScreen" Value="True">
-        <Setter Property="WindowChrome.WindowChrome">
-          <Setter.Value>
-            <WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
   </Style>
 
   <Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 09a20af8..739b20bb 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -64,6 +64,8 @@
 	
         public static readonly string BlurWindow = nameof(BlurWindow);
 	
+        public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow);
+	
         public static readonly string RateDemoCtl = nameof(RateDemoCtl);
 	
         public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index 5453ceaf..4962b589 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -35,6 +35,7 @@ var controlList = new List<string>
 	"FlipClockDemoCtl",
 	"QQGroupView",
 	"BlurWindow",
+	"NoNonClientAreaDragableWindow",
 	"RateDemoCtl",
 	"ShieldDemoCtl",
 	"WaterfallPanelDemoCtl",
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index bebcb158..1dcf7e7e 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -328,6 +328,9 @@
     <Compile Include="Window\CustomNonClientAreaWindow.xaml.cs">
       <DependentUpon>CustomNonClientAreaWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Window\NoNonClientAreaDragableWindow.xaml.cs">
+      <DependentUpon>NoNonClientAreaDragableWindow.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -664,6 +667,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Window\NoNonClientAreaDragableWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 717a2a83..7713303f 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性
         ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -366,6 +366,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 在这里拖拽 的本地化字符串。
+        /// </summary>
+        public static string DragHere {
+            get {
+                return ResourceManager.GetString("DragHere", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 邮箱 的本地化字符串。
         /// </summary>
@@ -672,6 +681,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
+        /// </summary>
+        public static string OpenNoNonClientAreaDragableWindow {
+            get {
+                return ResourceManager.GetString("OpenNoNonClientAreaDragableWindow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 轮廓文本 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index e236fd84..d1b851b1 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -462,4 +462,10 @@
   <data name="CoverFlow" xml:space="preserve">
     <value>CoverFlow</value>
   </data>
+  <data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
+    <value>open no Non-client Area dragable window</value>
+  </data>
+  <data name="DragHere" xml:space="preserve">
+    <value>Drag here</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index 681ac894..3e84d31b 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -1,76 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-		Microsoft ResX Schema
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -89,13 +109,13 @@
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
-    <value>1.3</value>
+    <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Controls" xml:space="preserve">
     <value>控件</value>
@@ -442,4 +462,10 @@
   <data name="CoverFlow" xml:space="preserve">
     <value>封面流</value>
   </data>
+  <data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
+    <value>打开无非客户端区域可拖拽窗口</value>
+  </data>
+  <data name="DragHere" xml:space="preserve">
+    <value>在这里拖拽</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
index ae0ca350..a79f0c29 100644
--- a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
@@ -7,13 +7,14 @@
              DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <UniformGrid Margin="32" Columns="3" Rows="2" Height="200">
+        <UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{x:Static langs:Lang.OpenBlurWindow}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{x:Static langs:Lang.OpenCustomNonClientAreaWindow}"/>
             <Button Click="ButtonMessage_OnClick" Content="{x:Static langs:Lang.OpenMessageWindow}"/>
             <Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
             <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
+            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
         </UniformGrid>
     </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml
new file mode 100644
index 00000000..18f02754
--- /dev/null
+++ b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml
@@ -0,0 +1,24 @@
+<controls:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
+                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+                     mc:Ignorable="d"
+                     WindowStartupLocation="CenterScreen"
+                     ShowTitle="True"
+                     Style="{StaticResource WindowBlur}"
+                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
+                     ShowNonClientArea="False"
+                     Title="NoClientDragableWindow" 
+                     Height="450" 
+                     Width="800">
+    <Grid>
+        <Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
+        <Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
+            <TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
+        </Border>
+        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
+    </Grid>
+</controls:BlurWindow>
diff --git a/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml.cs b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml.cs
new file mode 100644
index 00000000..5fc11285
--- /dev/null
+++ b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml.cs
@@ -0,0 +1,14 @@
+using System.Windows;
+
+namespace HandyControlDemo.Window
+{
+    public partial class NoNonClientAreaDragableWindow
+    {
+        public NoNonClientAreaDragableWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
+    }
+}