diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs index 31b41ecaf5..0e1540b5fd 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs +++ b/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 } diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs index b8429d32fc..fd2feb539f 100644 --- a/src/Avalonia.Controls/Platform/IWindowImpl.cs +++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs @@ -38,7 +38,7 @@ namespace Avalonia.Platform /// /// When system decorations are disabled sets if the maximized state covers the entire screen or just the working area. /// - void SetIgnoreTaskBarWhenMaximized(bool enable); + void SetCoverTaskbarWhenMaximized(bool enable); /// /// Sets the icon of this window. diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs index ae3846096a..a66bba1861 100644 --- a/src/Avalonia.Controls/Window.cs +++ b/src/Avalonia.Controls/Window.cs @@ -67,8 +67,8 @@ namespace Avalonia.Controls /// /// When system window decorations are disables sets if the Window when maximized ignores the taskbar. /// - public static readonly StyledProperty IgnoreTaskbarOnMaximizeProperty = - AvaloniaProperty.Register(nameof(IgnoreTaskBarOnMaximize), true); + public static readonly StyledProperty CoverTaskbarOnMaximizeProperty = + AvaloniaProperty.Register(nameof(CoverTaskbarOnMaximize), true); /// /// Defines the property. @@ -96,8 +96,8 @@ namespace Avalonia.Controls HasSystemDecorationsProperty.Changed.AddClassHandler( (s, e) => s.PlatformImpl.SetSystemDecorations((bool) e.NewValue)); - IgnoreTaskbarOnMaximizeProperty.Changed.AddClassHandler( - (s, e) => s.PlatformImpl.SetIgnoreTaskBarWhenMaximized((bool)e.NewValue)); + CoverTaskbarOnMaximizeProperty.Changed.AddClassHandler( + (s, e) => s.PlatformImpl.SetCoverTaskbarWhenMaximized((bool)e.NewValue)); IconProperty.Changed.AddClassHandler((s, e) => s.PlatformImpl.SetIcon(((WindowIcon)e.NewValue).PlatformImpl)); } @@ -168,12 +168,13 @@ namespace Avalonia.Controls } /// - /// 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. /// - public bool IgnoreTaskBarOnMaximize + public bool CoverTaskbarOnMaximize { - get { return GetValue(IgnoreTaskbarOnMaximizeProperty); } - set { SetValue(IgnoreTaskbarOnMaximizeProperty, value); } + get { return GetValue(CoverTaskbarOnMaximizeProperty); } + set { SetValue(CoverTaskbarOnMaximizeProperty, value); } } /// diff --git a/src/Gtk/Avalonia.Gtk/WindowImplBase.cs b/src/Gtk/Avalonia.Gtk/WindowImplBase.cs index bcb24e7a29..8641f2f431 100644 --- a/src/Gtk/Avalonia.Gtk/WindowImplBase.cs +++ b/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. } diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 4d0c97dfd6..0febe70876 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/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) { diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs index 566d924993..67817ef62a 100644 --- a/src/iOS/Avalonia.iOS/AvaloniaView.cs +++ b/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 }