From 1394995927dc87c017dc3160e5c586e26f10da12 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 25 Jan 2017 23:02:01 +0000
Subject: [PATCH] Win32 WindowImpl now obeys taskbar when maximizing by
 default.

---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index db46538796..ed6d9c32d3 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -33,7 +33,6 @@ namespace Avalonia.Win32
         private bool _trackingMouse;
         private bool _isActive;
         private bool _decorated = true;
-        private bool _coverTaskBarWhenMaximized = true;
         private double _scaling = 1;
         private WindowState _showWindowState;
 
@@ -678,8 +677,6 @@ namespace Avalonia.Win32
         {
             UnmanagedMethods.ShowWindowCommand command;
 
-            bool maximizeFillsDesktop = false; // otherwise we cover entire screen.
-
             switch (state)
             {
                 case WindowState.Minimized:
@@ -687,11 +684,6 @@ namespace Avalonia.Win32
                     break;
                 case WindowState.Maximized:
                     command = ShowWindowCommand.Maximize;
-
-                    if (!_decorated && !_coverTaskBarWhenMaximized)
-                    {
-                        maximizeFillsDesktop = true;
-                    }
                     break;
 
                 case WindowState.Normal:
@@ -704,10 +696,7 @@ namespace Avalonia.Win32
 
             UnmanagedMethods.ShowWindow(_hwnd, command);
 
-            if (maximizeFillsDesktop)
-            {
-                MaximizeWithoutCoveringTaskbar();
-            }
+            MaximizeWithoutCoveringTaskbar();
 
             if (!Design.IsDesignMode)
             {
@@ -751,15 +740,5 @@ namespace Avalonia.Win32
 
             return (int)(ptr.ToInt64() & 0xffffffff);
         }
-
-        public void SetCoverTaskbarWhenMaximized(bool enable)
-        {
-            _coverTaskBarWhenMaximized = enable;
-
-            if (_showWindowState == WindowState.Maximized)
-            {
-                ShowWindow(WindowState.Maximized);
-            }
-        }
     }
 }