From bb838ae7f8f27b16544ff8047239c13a7159e88d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 22 Jul 2021 22:42:01 +0800
Subject: [PATCH] formatted window code

---
 .../Controls/Window/BlurWindow.cs             |   4 +-
 .../Controls/Window/GlowWindow.cs             |   4 +-
 .../Controls/Window/Window.cs                 | 484 ++++++++++--------
 3 files changed, 264 insertions(+), 228 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
index 74bfe398..005fad7a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
@@ -11,13 +11,13 @@ namespace HandyControl.Controls
     {
         protected override void OnSourceInitialized(EventArgs e)
         {
+            base.OnSourceInitialized(e);
+
             var versionInfo = SystemHelper.GetSystemVersionInfo();
             if (versionInfo >= SystemVersionInfo.Windows10_1903)
             {
                 this.GetHwndSource()?.AddHook(HwndSourceHook);
             }
-
-            base.OnSourceInitialized(e);
         }
 
         private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index 17d81a5c..0247440f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -161,14 +161,14 @@ namespace HandyControl.Controls
 
         protected override void OnSourceInitialized(EventArgs e)
         {
+            base.OnSourceInitialized(e);
+
             var hwndSource = this.GetHwndSource();
             if (hwndSource != null)
             {
                 hwndSource.AddHook(HwndSourceHook);
                 CreateGlowWindowHandles();
             }
-
-            base.OnSourceInitialized(e);
         }
 
         #endregion
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
index e3dc1c17..448c08e2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
@@ -19,66 +19,10 @@ namespace HandyControl.Controls
     [TemplatePart(Name = ElementNonClientArea, Type = typeof(UIElement))]
     public class Window : System.Windows.Window
     {
+        #region fields
+
         private const string ElementNonClientArea = "PART_NonClientArea";
-
-        public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
-            "NonClientAreaContent", typeof(object), typeof(Window), new PropertyMetadata(default(object)));
-
-        public static readonly DependencyProperty CloseButtonHoverBackgroundProperty = DependencyProperty.Register(
-            "CloseButtonHoverBackground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty CloseButtonHoverForegroundProperty =
-            DependencyProperty.Register(
-                "CloseButtonHoverForeground", typeof(Brush), typeof(Window),
-                new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty CloseButtonBackgroundProperty = DependencyProperty.Register(
-            "CloseButtonBackground", typeof(Brush), typeof(Window), new PropertyMetadata(Brushes.Transparent));
-
-        public static readonly DependencyProperty CloseButtonForegroundProperty = DependencyProperty.Register(
-            "CloseButtonForeground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(Brushes.White));
-
-        public static readonly DependencyProperty OtherButtonBackgroundProperty = DependencyProperty.Register(
-            "OtherButtonBackground", typeof(Brush), typeof(Window), new PropertyMetadata(Brushes.Transparent));
-
-        public static readonly DependencyProperty OtherButtonForegroundProperty = DependencyProperty.Register(
-            "OtherButtonForeground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(Brushes.White));
-
-        public static readonly DependencyProperty OtherButtonHoverBackgroundProperty = DependencyProperty.Register(
-            "OtherButtonHoverBackground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty OtherButtonHoverForegroundProperty =
-            DependencyProperty.Register(
-                "OtherButtonHoverForeground", typeof(Brush), typeof(Window),
-                new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty NonClientAreaBackgroundProperty = DependencyProperty.Register(
-            "NonClientAreaBackground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty NonClientAreaForegroundProperty = DependencyProperty.Register(
-            "NonClientAreaForeground", typeof(Brush), typeof(Window),
-            new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty NonClientAreaHeightProperty = DependencyProperty.Register(
-            "NonClientAreaHeight", typeof(double), typeof(Window),
-            new PropertyMetadata(22.0));
-
-        public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
-            "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.TrueBox));
-
-        public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
-            "IsFullScreen", typeof(bool), typeof(Window),
-            new PropertyMetadata(ValueBoxes.FalseBox, OnIsFullScreenChanged));
-
+        
         private bool _isFullScreen;
 
         private Thickness _actualBorderThickness;
@@ -97,6 +41,10 @@ namespace HandyControl.Controls
 
         private UIElement _nonClientArea;
 
+        #endregion
+
+        #region ctor
+
         static Window()
         {
             StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(ResourceHelper.GetResourceInternal<Style>(ResourceToken.WindowWin10)));
@@ -126,6 +74,256 @@ namespace HandyControl.Controls
             Loaded += (s, e) => OnLoaded(e);
         }
 
+        #endregion 
+
+        #region prop
+
+        public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
+            "NonClientAreaContent", typeof(object), typeof(Window), new PropertyMetadata(default(object)));
+
+        public object NonClientAreaContent
+        {
+            get => GetValue(NonClientAreaContentProperty);
+            set => SetValue(NonClientAreaContentProperty, value);
+        }
+
+        public static readonly DependencyProperty CloseButtonHoverBackgroundProperty = DependencyProperty.Register(
+            "CloseButtonHoverBackground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(default(Brush)));
+
+        public Brush CloseButtonHoverBackground
+        {
+            get => (Brush) GetValue(CloseButtonHoverBackgroundProperty);
+            set => SetValue(CloseButtonHoverBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty CloseButtonHoverForegroundProperty =
+            DependencyProperty.Register(
+                "CloseButtonHoverForeground", typeof(Brush), typeof(Window),
+                new PropertyMetadata(default(Brush)));
+
+        public Brush CloseButtonHoverForeground
+        {
+            get => (Brush) GetValue(CloseButtonHoverForegroundProperty);
+            set => SetValue(CloseButtonHoverForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty CloseButtonBackgroundProperty = DependencyProperty.Register(
+            "CloseButtonBackground", typeof(Brush), typeof(Window), new PropertyMetadata(Brushes.Transparent));
+
+        public Brush CloseButtonBackground
+        {
+            get => (Brush) GetValue(CloseButtonBackgroundProperty);
+            set => SetValue(CloseButtonBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty CloseButtonForegroundProperty = DependencyProperty.Register(
+            "CloseButtonForeground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(Brushes.White));
+
+        public Brush CloseButtonForeground
+        {
+            get => (Brush) GetValue(CloseButtonForegroundProperty);
+            set => SetValue(CloseButtonForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OtherButtonBackgroundProperty = DependencyProperty.Register(
+            "OtherButtonBackground", typeof(Brush), typeof(Window), new PropertyMetadata(Brushes.Transparent));
+
+        public Brush OtherButtonBackground
+        {
+            get => (Brush) GetValue(OtherButtonBackgroundProperty);
+            set => SetValue(OtherButtonBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OtherButtonForegroundProperty = DependencyProperty.Register(
+            "OtherButtonForeground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(Brushes.White));
+
+        public Brush OtherButtonForeground
+        {
+            get => (Brush) GetValue(OtherButtonForegroundProperty);
+            set => SetValue(OtherButtonForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OtherButtonHoverBackgroundProperty = DependencyProperty.Register(
+            "OtherButtonHoverBackground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(default(Brush)));
+
+        public Brush OtherButtonHoverBackground
+        {
+            get => (Brush) GetValue(OtherButtonHoverBackgroundProperty);
+            set => SetValue(OtherButtonHoverBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OtherButtonHoverForegroundProperty =
+            DependencyProperty.Register(
+                "OtherButtonHoverForeground", typeof(Brush), typeof(Window),
+                new PropertyMetadata(default(Brush)));
+
+        public Brush OtherButtonHoverForeground
+        {
+            get => (Brush) GetValue(OtherButtonHoverForegroundProperty);
+            set => SetValue(OtherButtonHoverForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty NonClientAreaBackgroundProperty = DependencyProperty.Register(
+            "NonClientAreaBackground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(default(Brush)));
+
+        public Brush NonClientAreaBackground
+        {
+            get => (Brush) GetValue(NonClientAreaBackgroundProperty);
+            set => SetValue(NonClientAreaBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty NonClientAreaForegroundProperty = DependencyProperty.Register(
+            "NonClientAreaForeground", typeof(Brush), typeof(Window),
+            new PropertyMetadata(default(Brush)));
+
+        public Brush NonClientAreaForeground
+        {
+            get => (Brush) GetValue(NonClientAreaForegroundProperty);
+            set => SetValue(NonClientAreaForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty NonClientAreaHeightProperty = DependencyProperty.Register(
+            "NonClientAreaHeight", typeof(double), typeof(Window),
+            new PropertyMetadata(22.0));
+
+        public double NonClientAreaHeight
+        {
+            get => (double) GetValue(NonClientAreaHeightProperty);
+            set => SetValue(NonClientAreaHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
+            "ShowNonClientArea", typeof(bool), typeof(Window),
+            new PropertyMetadata(ValueBoxes.TrueBox, OnShowNonClientAreaChanged));
+
+        public bool ShowNonClientArea
+        {
+            get => (bool) GetValue(ShowNonClientAreaProperty);
+            set => SetValue(ShowNonClientAreaProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
+            "ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public bool ShowTitle
+        {
+            get => (bool) GetValue(ShowTitleProperty);
+            set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
+            "IsFullScreen", typeof(bool), typeof(Window),
+            new PropertyMetadata(ValueBoxes.FalseBox, OnIsFullScreenChanged));
+
+        public bool IsFullScreen
+        {
+            get => (bool) GetValue(IsFullScreenProperty);
+            set => SetValue(IsFullScreenProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        public static readonly DependencyProperty ShowIconProperty = DependencyProperty.Register(
+            "ShowIcon", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public bool ShowIcon
+        {
+            get => (bool) GetValue(ShowIconProperty);
+            set => SetValue(ShowIconProperty, value);
+        }
+
+        #endregion
+
+        #region methods
+
+        #region public
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _nonClientArea = GetTemplateChild(ElementNonClientArea) as UIElement;
+        }
+
+        #endregion
+
+        #region protected
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);
+            this.GetHwndSource()?.AddHook(HwndSourceHook);
+        }
+
+        protected override void OnStateChanged(EventArgs e)
+        {
+            base.OnStateChanged(e);
+            if (WindowState == WindowState.Maximized)
+            {
+                BorderThickness = new Thickness();
+                _tempNonClientAreaHeight = NonClientAreaHeight;
+                NonClientAreaHeight += 8;
+            }
+            else
+            {
+                BorderThickness = _actualBorderThickness;
+                NonClientAreaHeight = _tempNonClientAreaHeight;
+            }
+        }
+
+        protected void OnLoaded(RoutedEventArgs args)
+        {
+            _actualBorderThickness = BorderThickness;
+            _tempNonClientAreaHeight = NonClientAreaHeight;
+
+            if (WindowState == WindowState.Maximized)
+            {
+                BorderThickness = new Thickness();
+                _tempNonClientAreaHeight += 8;
+            }
+
+            CommandBindings.Add(new CommandBinding(SystemCommands.MinimizeWindowCommand,
+                (s, e) => WindowState = WindowState.Minimized));
+            CommandBindings.Add(new CommandBinding(SystemCommands.MaximizeWindowCommand,
+                (s, e) => WindowState = WindowState.Maximized));
+            CommandBindings.Add(new CommandBinding(SystemCommands.RestoreWindowCommand,
+                (s, e) => WindowState = WindowState.Normal));
+            CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
+            CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
+
+            _tempWindowState = WindowState;
+            _tempWindowStyle = WindowStyle;
+            _tempResizeMode = ResizeMode;
+
+            SwitchIsFullScreen(_isFullScreen);
+            SwitchShowNonClientArea(_showNonClientArea);
+
+            if (WindowState == WindowState.Maximized)
+            {
+                _tempNonClientAreaHeight -= 8;
+            }
+
+            if (SizeToContent != SizeToContent.WidthAndHeight)
+                return;
+
+            SizeToContent = SizeToContent.Height;
+            Dispatcher.BeginInvoke(new Action(() => { SizeToContent = SizeToContent.WidthAndHeight; }));
+        }
+
+        protected override void OnContentRendered(EventArgs e)
+        {
+            base.OnContentRendered(e);
+            if (SizeToContent == SizeToContent.WidthAndHeight)
+                InvalidateMeasure();
+        }
+
+        #endregion
+
+        #region private
+
         private void WmGetMinMaxInfo(IntPtr hwnd, IntPtr lParam)
         {
             var mmi = (InteropValues.MINMAXINFO) Marshal.PtrToStructure(lParam, typeof(InteropValues.MINMAXINFO));
@@ -152,12 +350,6 @@ namespace HandyControl.Controls
             Marshal.StructureToPtr(mmi, lParam, true);
         }
 
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            this.GetHwndSource()?.AddHook(HwndSourceHook);
-            base.OnSourceInitialized(e);
-        }
-
         private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
         {
             switch (msg)
@@ -186,97 +378,6 @@ namespace HandyControl.Controls
             return IntPtr.Zero;
         }
 
-
-        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, ValueBoxes.BooleanBox(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, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool ShowTitle
-        {
-            get => (bool) GetValue(ShowTitleProperty);
-            set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value));
-        }
-
         private static void OnShowNonClientAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var ctl = (Window) d;
@@ -362,68 +463,6 @@ namespace HandyControl.Controls
             }
         }
 
-        protected override void OnStateChanged(EventArgs e)
-        {
-            base.OnStateChanged(e);
-            if (WindowState == WindowState.Maximized)
-            {
-                BorderThickness = new Thickness();
-                _tempNonClientAreaHeight = NonClientAreaHeight;
-                NonClientAreaHeight += 8;
-            }
-            else
-            {
-                BorderThickness = _actualBorderThickness;
-                NonClientAreaHeight = _tempNonClientAreaHeight;
-            }
-        }
-
-        protected void OnLoaded(RoutedEventArgs args)
-        {
-            _actualBorderThickness = BorderThickness;
-            _tempNonClientAreaHeight = NonClientAreaHeight;
-
-            if (WindowState == WindowState.Maximized)
-            {
-                BorderThickness = new Thickness();
-                _tempNonClientAreaHeight += 8;
-            }
-
-            CommandBindings.Add(new CommandBinding(SystemCommands.MinimizeWindowCommand,
-                (s, e) => WindowState = WindowState.Minimized));
-            CommandBindings.Add(new CommandBinding(SystemCommands.MaximizeWindowCommand,
-                (s, e) => WindowState = WindowState.Maximized));
-            CommandBindings.Add(new CommandBinding(SystemCommands.RestoreWindowCommand,
-                (s, e) => WindowState = WindowState.Normal));
-            CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
-            CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
-
-            _tempWindowState = WindowState;
-            _tempWindowStyle = WindowStyle;
-            _tempResizeMode = ResizeMode;
-
-            SwitchIsFullScreen(_isFullScreen);
-            SwitchShowNonClientArea(_showNonClientArea);
-
-            if (WindowState == WindowState.Maximized)
-            {
-                _tempNonClientAreaHeight -= 8;
-            }
-
-            if (SizeToContent != SizeToContent.WidthAndHeight)
-                return;
-
-            SizeToContent = SizeToContent.Height;
-            Dispatcher.BeginInvoke(new Action(() => { SizeToContent = SizeToContent.WidthAndHeight; }));
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _nonClientArea = GetTemplateChild(ElementNonClientArea) as UIElement;
-        }
-
         private void ShowSystemMenu(object sender, ExecutedRoutedEventArgs e)
         {
             var point = WindowState == WindowState.Maximized
@@ -432,11 +471,8 @@ namespace HandyControl.Controls
             SystemCommands.ShowSystemMenu(this, point);
         }
 
-        protected override void OnContentRendered(EventArgs e)
-        {
-            base.OnContentRendered(e);
-            if (SizeToContent == SizeToContent.WidthAndHeight)
-                InvalidateMeasure();
-        }
+        #endregion
+
+        #endregion
     }
 }