Merge branch 'master' into multi-render-target

build.cake

@@ -197,6 +197,7 @@ var SystemReactiveVersion = packageVersions["System.Reactive"].FirstOrDefault().
 var SkiaSharpVersion = packageVersions["SkiaSharp"].FirstOrDefault().Item1;
 var SharpDXVersion = packageVersions["SharpDX"].FirstOrDefault().Item1;
 var SharpDXDirect2D1Version = packageVersions["SharpDX.Direct2D1"].FirstOrDefault().Item1;
+var SharpDXDirect3D11Version = packageVersions["SharpDX.Direct3D11"].FirstOrDefault().Item1;
 var SharpDXDXGIVersion = packageVersions["SharpDX.DXGI"].FirstOrDefault().Item1;
 
 Information("Package: Serilog, version: {0}", SerilogVersion);
@@ -206,6 +207,7 @@ Information("Package: System.Reactive, version: {0}", SystemReactiveVersion);
 Information("Package: SkiaSharp, version: {0}", SkiaSharpVersion);
 Information("Package: SharpDX, version: {0}", SharpDXVersion);
 Information("Package: SharpDX.Direct2D1, version: {0}", SharpDXDirect2D1Version);
+Information("Package: SharpDX.Direct3D11, version: {0}", SharpDXDirect3D11Version);
 Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion);
 
 var SetNuGetNuspecCommonProperties = new Action<NuGetPackSettings> ((nuspec) => {
@@ -441,6 +443,7 @@ var nuspecNuGetSettingsDesktop = new []
             new NuSpecDependency() { Id = "Avalonia", Version = version },
             new NuSpecDependency() { Id = "SharpDX", Version = SharpDXVersion },
             new NuSpecDependency() { Id = "SharpDX.Direct2D1", Version = SharpDXDirect2D1Version },
+            new NuSpecDependency() { Id = "SharpDX.Direct3D11", Version = SharpDXDirect3D11Version },
             new NuSpecDependency() { Id = "SharpDX.DXGI", Version = SharpDXDXGIVersion }
         },
         Files = new []

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

@@ -111,11 +111,6 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
         }
 
-        public void SetCoverTaskbarWhenMaximized(bool enable)
-        {
-            //Not supported
-        }
-
         public void Invalidate(Rect rect)
         {
             if (Holder?.Surface?.IsValid == true) base.Invalidate();

src/Avalonia.Controls/Platform/IWindowImpl.cs

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

src/Avalonia.Controls/Window.cs

@@ -64,13 +64,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> HasSystemDecorationsProperty =
             AvaloniaProperty.Register<Window, bool>(nameof(HasSystemDecorations), true);
 
-        /// <summary>
-        /// Sets if the window should cover the taskbar when maximized. Only applies to Windows 
-        /// with HasSystemDecorations = false.
-        /// </summary>
-        public static readonly StyledProperty<bool> CoverTaskbarOnMaximizeProperty =
-            AvaloniaProperty.Register<Window, bool>(nameof(CoverTaskbarOnMaximize), true);
-
         /// <summary>
         /// Defines the <see cref="Title"/> property.
         /// </summary>
@@ -97,9 +90,6 @@ namespace Avalonia.Controls
             HasSystemDecorationsProperty.Changed.AddClassHandler<Window>(
                 (s, e) => s.PlatformImpl.SetSystemDecorations((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,16 +158,6 @@ namespace Avalonia.Controls
             set { SetValue(HasSystemDecorationsProperty, value); }
         }
 
-        /// <summary>
-        /// Sets if the window should cover the taskbar when maximized. Only applies to Windows 
-        /// with HasSystemDecorations = false.
-        /// </summary>
-        public bool CoverTaskbarOnMaximize
-        {
-            get { return GetValue(CoverTaskbarOnMaximizeProperty); }
-            set { SetValue(CoverTaskbarOnMaximizeProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets the minimized/maximized state of the window.
         /// </summary>

src/Gtk/Avalonia.Gtk/WindowImplBase.cs

@@ -311,11 +311,6 @@ namespace Avalonia.Gtk
             args.RetVal = true;
         }
 
-        public void SetCoverTaskbarWhenMaximized(bool enable)
-        {
-            // No action neccesary on Gtk.
-        }
-
         public void Dispose()
         {
             _framebuffer.Dispose();

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -34,7 +34,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;
         private FramebufferManager _framebuffer;
@@ -687,8 +686,6 @@ namespace Avalonia.Win32
         {
             UnmanagedMethods.ShowWindowCommand command;
 
-            bool maximizeFillsDesktop = false; // otherwise we cover entire screen.
-
             switch (state)
             {
                 case WindowState.Minimized:
@@ -696,11 +693,6 @@ namespace Avalonia.Win32
                     break;
                 case WindowState.Maximized:
                     command = ShowWindowCommand.Maximize;
-
-                    if (!_decorated && !_coverTaskBarWhenMaximized)
-                    {
-                        maximizeFillsDesktop = true;
-                    }
                     break;
 
                 case WindowState.Normal:
@@ -713,7 +705,7 @@ namespace Avalonia.Win32
 
             UnmanagedMethods.ShowWindow(_hwnd, command);
 
-            if (maximizeFillsDesktop)
+            if (state == WindowState.Maximized)
             {
                 MaximizeWithoutCoveringTaskbar();
             }
@@ -760,15 +752,5 @@ namespace Avalonia.Win32
 
             return (int)(ptr.ToInt64() & 0xffffffff);
         }
-
-        public void SetCoverTaskbarWhenMaximized(bool enable)
-        {
-            _coverTaskBarWhenMaximized = enable;
-
-            if (_showWindowState == WindowState.Maximized)
-            {
-                ShowWindow(WindowState.Maximized);
-            }
-        }
     }
 }

src/iOS/Avalonia.iOS/AvaloniaView.cs

@@ -173,11 +173,6 @@ namespace Avalonia.iOS
             //Not supported
         }
 
-        public void SetCoverTaskbarWhenMaximized(bool enable)
-        {
-            //Not supported
-        }
-
         public override void TouchesEnded(NSSet touches, UIEvent evt)
         {
             var touch = touches.AnyObject as UITouch;