Browse Source

Renamed property to CoverTaskbarWhenMaximized.

pull/805/head
Dan Walmsley 10 years ago
parent
commit
43cac2c562
  1. 2
      src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs
  2. 2
      src/Avalonia.Controls/Platform/IWindowImpl.cs
  3. 17
      src/Avalonia.Controls/Window.cs
  4. 2
      src/Gtk/Avalonia.Gtk/WindowImplBase.cs
  5. 8
      src/Windows/Avalonia.Win32/WindowImpl.cs
  6. 2
      src/iOS/Avalonia.iOS/AvaloniaView.cs

2
src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs

@ -108,7 +108,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
{
}
public void SetIgnoreTaskBarWhenMaximized(bool enable)
public void SetCoverTaskbarWhenMaximized(bool enable)
{
//Not supported
}

2
src/Avalonia.Controls/Platform/IWindowImpl.cs

@ -38,7 +38,7 @@ namespace Avalonia.Platform
/// <summary>
/// When system decorations are disabled sets if the maximized state covers the entire screen or just the working area.
/// </summary>
void SetIgnoreTaskBarWhenMaximized(bool enable);
void SetCoverTaskbarWhenMaximized(bool enable);
/// <summary>
/// Sets the icon of this window.

17
src/Avalonia.Controls/Window.cs

@ -67,8 +67,8 @@ namespace Avalonia.Controls
/// <summary>
/// When system window decorations are disables sets if the Window when maximized ignores the taskbar.
/// </summary>
public static readonly StyledProperty<bool> IgnoreTaskbarOnMaximizeProperty =
AvaloniaProperty.Register<Window, bool>(nameof(IgnoreTaskBarOnMaximize), true);
public static readonly StyledProperty<bool> CoverTaskbarOnMaximizeProperty =
AvaloniaProperty.Register<Window, bool>(nameof(CoverTaskbarOnMaximize), true);
/// <summary>
/// Defines the <see cref="Title"/> property.
@ -96,8 +96,8 @@ namespace Avalonia.Controls
HasSystemDecorationsProperty.Changed.AddClassHandler<Window>(
(s, e) => s.PlatformImpl.SetSystemDecorations((bool) e.NewValue));
IgnoreTaskbarOnMaximizeProperty.Changed.AddClassHandler<Window>(
(s, e) => s.PlatformImpl.SetIgnoreTaskBarWhenMaximized((bool)e.NewValue));
CoverTaskbarOnMaximizeProperty.Changed.AddClassHandler<Window>(
(s, e) => s.PlatformImpl.SetCoverTaskbarWhenMaximized((bool)e.NewValue));
IconProperty.Changed.AddClassHandler<Window>((s, e) => s.PlatformImpl.SetIcon(((WindowIcon)e.NewValue).PlatformImpl));
}
@ -168,12 +168,13 @@ namespace Avalonia.Controls
}
/// <summary>
/// When system window decorations are disables sets if the Window when maximized ignores the taskbar.
/// Sets if the Window should Covert the taskbar when Maximized. Only applies to Windows
/// with HasSystemDecorations = false.
/// </summary>
public bool IgnoreTaskBarOnMaximize
public bool CoverTaskbarOnMaximize
{
get { return GetValue(IgnoreTaskbarOnMaximizeProperty); }
set { SetValue(IgnoreTaskbarOnMaximizeProperty, value); }
get { return GetValue(CoverTaskbarOnMaximizeProperty); }
set { SetValue(CoverTaskbarOnMaximizeProperty, value); }
}
/// <summary>

2
src/Gtk/Avalonia.Gtk/WindowImplBase.cs

@ -304,7 +304,7 @@ namespace Avalonia.Gtk
args.RetVal = true;
}
public void SetIgnoreTaskBarWhenMaximized(bool enable)
public void SetCoverTaskbarWhenMaximized(bool enable)
{
// No action neccesary on Gtk.
}

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

@ -33,7 +33,7 @@ namespace Avalonia.Win32
private bool _trackingMouse;
private bool _isActive;
private bool _decorated = true;
private bool _ignoreTaskBarWhenMaximized = true;
private bool _coverTaskBarWhenMaximized = true;
private double _scaling = 1;
private WindowState _showWindowState;
@ -688,7 +688,7 @@ namespace Avalonia.Win32
case WindowState.Maximized:
command = ShowWindowCommand.Maximize;
if (!_decorated && !_ignoreTaskBarWhenMaximized)
if (!_decorated && !_coverTaskBarWhenMaximized)
{
maximizeFillsDesktop = true;
}
@ -749,9 +749,9 @@ namespace Avalonia.Win32
return (int)(ptr.ToInt64() & 0xffffffff);
}
public void SetIgnoreTaskBarWhenMaximized(bool enable)
public void SetCoverTaskbarWhenMaximized(bool enable)
{
_ignoreTaskBarWhenMaximized = enable;
_coverTaskBarWhenMaximized = enable;
if(_showWindowState == WindowState.Maximized)
{

2
src/iOS/Avalonia.iOS/AvaloniaView.cs

@ -170,7 +170,7 @@ namespace Avalonia.iOS
//Not supported
}
public void SetIgnoreTaskBarWhenMaximized(bool enable)
public void SetCoverTaskbarWhenMaximized(bool enable)
{
//Not supported
}

Loading…
Cancel
Save