Browse Source

Win32 WindowImpl now obeys taskbar when maximizing by default.

pull/862/head
Dan Walmsley 10 years ago
parent
commit
1394995927
  1. 23
      src/Windows/Avalonia.Win32/WindowImpl.cs

23
src/Windows/Avalonia.Win32/WindowImpl.cs

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

Loading…
Cancel
Save