From 07475d12f9d973c307de4584e291def4ec009d4a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 1 Dec 2018 14:56:07 +0000
Subject: [PATCH] simplify apply styles

---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 69 ++++++++++++------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 8343ccbd44..4316166343 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -271,7 +271,9 @@ namespace Avalonia.Win32
                 return;
             }
 
-            UpdateWMStyles(() => _decorated = value);
+            _decorated = value;
+
+            UpdateWMStyles();
         }
 
         public void Invalidate(Rect rect)
@@ -884,15 +886,15 @@ namespace Avalonia.Win32
             }
         }
 
-        private void UpdateWMStyles(Action changer)
+        private void UpdateWMStyles()
         {
-            var decorated = _decorated;
+            var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE);
 
-            var resizable = _resizable;
+            const WindowStyles controlledFlags = WindowStyles.WS_OVERLAPPEDWINDOW;
 
-            changer();
+            style = style | controlledFlags ^ controlledFlags;
 
-            var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE) | WindowStyles.WS_OVERLAPPEDWINDOW;
+            style |= WindowStyles.WS_OVERLAPPEDWINDOW;
 
             if (!_decorated)
             {
@@ -904,40 +906,39 @@ namespace Avalonia.Win32
                 style ^= (WindowStyles.WS_SIZEFRAME);
             }
 
+            UnmanagedMethods.GetWindowRect(_hwnd, out var oldRect);
+
             SetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE, (uint)style);
 
-            if (decorated != _decorated)
-            {
-                UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
+            UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
 
-                var oldThickness = BorderThickness;
+            var oldThickness = BorderThickness;
 
-                Rect newRect;
+            Rect newRect;
 
-                if (_decorated)
-                {
-                    var thickness = BorderThickness;
+            if (_decorated)
+            {
+                var thickness = BorderThickness;
 
-                    newRect = new Rect(
-                        windowRect.left - thickness.Left,
-                        windowRect.top - thickness.Top,
-                        (windowRect.right - windowRect.left) + (thickness.Left + thickness.Right),
-                        (windowRect.bottom - windowRect.top) + (thickness.Top + thickness.Bottom));
-                }
-                else
-                {
-                    newRect = new Rect(
-                        windowRect.left + oldThickness.Left,
-                        windowRect.top + oldThickness.Top,
-                        (windowRect.right - windowRect.left) - (oldThickness.Left + oldThickness.Right),
-                        (windowRect.bottom - windowRect.top) - (oldThickness.Top + oldThickness.Bottom));
-                }
+                newRect = new Rect(
+                    windowRect.left - thickness.Left,
+                    windowRect.top - thickness.Top,
+                    (windowRect.right - windowRect.left) + (thickness.Left + thickness.Right),
+                    (windowRect.bottom - windowRect.top) + (thickness.Top + thickness.Bottom));
+            }
+            else
+            {
+                newRect = new Rect(
+                    windowRect.left + oldThickness.Left,
+                    windowRect.top + oldThickness.Top,
+                    (windowRect.right - windowRect.left) - (oldThickness.Left + oldThickness.Right),
+                    (windowRect.bottom - windowRect.top) - (oldThickness.Top + oldThickness.Bottom));
+            }
 
-                UnmanagedMethods.SetWindowPos(_hwnd, IntPtr.Zero, (int)newRect.X, (int)newRect.Y, (int)newRect.Width,
-                    (int)newRect.Height,
-                    UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
+            UnmanagedMethods.SetWindowPos(_hwnd, IntPtr.Zero, (int)newRect.X, (int)newRect.Y, (int)newRect.Width,
+                (int)newRect.Height,
+                UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
 
-            }
         }
 
         public void CanResize(bool value)
@@ -947,7 +948,9 @@ namespace Avalonia.Win32
                 return;
             }
 
-            UpdateWMStyles(() => _resizable = value);
+            _resizable = value;
+
+            UpdateWMStyles();
         }
 
         public void SetTopmost(bool value)