From 6c852f805f7d61f8a272398c9668a420e6f6c9cf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 29 Mar 2023 19:13:31 +0200
Subject: [PATCH 1/7] Don't allow window zoom when CanResize=false.

---
 src/Avalonia.Native/WindowImpl.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index 5d0e6a2d18..817fe3d080 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -21,6 +21,7 @@ namespace Avalonia.Native
         private DoubleClickHelper _doubleClickHelper;
         private readonly ITopLevelNativeMenuExporter _nativeMenuExporter;
         private readonly AvaloniaNativeTextInputMethod _inputMethod;
+        private bool _canResize = true;
 
         internal WindowImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts,
             AvaloniaNativeGlPlatformGraphics glFeature) : base(factory, opts, glFeature)
@@ -75,6 +76,7 @@ namespace Avalonia.Native
 
         public void CanResize(bool value)
         {
+            _canResize = value;
             _native.SetCanResize(value.AsComBool());
         }
 
@@ -137,14 +139,10 @@ namespace Avalonia.Native
                     {
                         if (_doubleClickHelper.IsDoubleClick(e.Timestamp, e.Position))
                         {
-                            // TOGGLE WINDOW STATE.
-                            if (WindowState == WindowState.Maximized || WindowState == WindowState.FullScreen)
+                            if (_canResize)
                             {
-                                WindowState = WindowState.Normal;
-                            }
-                            else
-                            {
-                                WindowState = WindowState.Maximized;
+                                WindowState = WindowState is WindowState.Maximized or WindowState.FullScreen ?
+                                    WindowState.Normal : WindowState.Maximized;
                             }
                         }
                         else

From 63295e817f23679cfcc3aefbb4320680d21b47ff Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 29 Mar 2023 23:28:11 +0200
Subject: [PATCH 2/7] Fix ControlAutomationPeer.GetName.

:facepalm:
---
 .../Automation/Peers/ControlAutomationPeer.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
index e8fb6b75ad..d04dfec3e8 100644
--- a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
@@ -88,10 +88,10 @@ namespace Avalonia.Automation.Peers
 
             if (string.IsNullOrWhiteSpace(result) && GetLabeledBy() is AutomationPeer labeledBy)
             {
-                return labeledBy.GetName();
+                result = labeledBy.GetName();
             }
 
-            return null;
+            return result;
         }
 
         protected override AutomationPeer? GetParentCore()

From f8a8c4ab1facf4d795ea3b37b0874a6a90866609 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 29 Mar 2023 23:29:20 +0200
Subject: [PATCH 3/7] Run check for disabled maximize button on Windows.

And also check with client-side decorations.
---
 .../Controls/CaptionButtons.xaml              |  9 ++-
 .../WindowTests.cs                            | 55 ++++++++++++++++++-
 .../WindowTests_MacOS.cs                      | 16 ------
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 71ae012289..7ce775e4c2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -48,7 +48,8 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_MinimiseButton"
-                  Theme="{StaticResource FluentCaptionButton}">
+                  Theme="{StaticResource FluentCaptionButton}"
+                  AutomationProperties.Name="Minimise">
             <Viewbox Width="11" Margin="2">
               <Path Stretch="UniformToFill"
                     Fill="{TemplateBinding Foreground}"
@@ -56,7 +57,8 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_RestoreButton"
-                  Theme="{StaticResource FluentCaptionButton}">
+                  Theme="{StaticResource FluentCaptionButton}"
+                  AutomationProperties.Name="Maximise">
             <Viewbox Width="11" Margin="2">
               <Viewbox.RenderTransform>
                 <RotateTransform Angle="-90" />
@@ -70,7 +72,8 @@
           <Button x:Name="PART_CloseButton"
                   Background="#ffe81123"
                   BorderBrush="#fff1707a"
-                  Theme="{StaticResource FluentCaptionButton}">
+                  Theme="{StaticResource FluentCaptionButton}"
+                  AutomationProperties.Name="Close">
             <Viewbox Width="11" Margin="2">
               <Path Stretch="UniformToFill"
                     Fill="{TemplateBinding Foreground}"
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index 6921a23161..a0ecd1f2d0 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -12,6 +12,7 @@ using OpenQA.Selenium.Interactions;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 using Xunit.Sdk;
+using OpenQA.Selenium.Appium.Interfaces;
 
 namespace Avalonia.IntegrationTests.Appium
 {
@@ -249,6 +250,36 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal(new Rgba32(255, 0, 0), centerColor);
         }
 
+        [Theory]
+        [InlineData(ShowWindowMode.NonOwned, true)]
+        [InlineData(ShowWindowMode.Owned, true)]
+        [InlineData(ShowWindowMode.Modal, true)]
+        [InlineData(ShowWindowMode.NonOwned, false)]
+        [InlineData(ShowWindowMode.Owned, false)]
+        [InlineData(ShowWindowMode.Modal, false)]
+        public void Window_Has_Disabled_Maximize_Button_When_CanResize_Is_False(ShowWindowMode mode, bool extendClientArea)
+        {
+            using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false, extendClientArea: extendClientArea))
+            {
+                var secondaryWindow = GetWindow("SecondaryWindow");
+                AppiumWebElement? maximizeButton;
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    var foo = _session.PageSource;
+                    maximizeButton = secondaryWindow.FindElementByXPath("//Button[@Name='Maximise']");
+                }
+                else
+                {
+                    maximizeButton = mode == ShowWindowMode.NonOwned ?
+                        secondaryWindow.FindElementByAccessibilityId("_XCUI:FullScreenWindow") :
+                        secondaryWindow.FindElementByAccessibilityId("_XCUI:ZoomWindow");
+                }
+
+                Assert.False(maximizeButton.Enabled);
+            }
+        }
+
         public static TheoryData<Size?, ShowWindowMode, WindowStartupLocation, bool> StartupLocationData()
         {
             var sizes = new Size?[] { null, new Size(400, 300) };
@@ -333,7 +364,8 @@ namespace Avalonia.IntegrationTests.Appium
             ShowWindowMode mode,
             WindowStartupLocation location = WindowStartupLocation.Manual,
             WindowState state = Controls.WindowState.Normal,
-            bool canResize = true)
+            bool canResize = true,
+            bool extendClientArea = false)
         {
             var sizeTextBox = _session.FindElementByAccessibilityId("ShowWindowSize");
             var modeComboBox = _session.FindElementByAccessibilityId("ShowWindowMode");
@@ -341,7 +373,8 @@ namespace Avalonia.IntegrationTests.Appium
             var stateComboBox = _session.FindElementByAccessibilityId("ShowWindowState");
             var canResizeCheckBox = _session.FindElementByAccessibilityId("ShowWindowCanResize");
             var showButton = _session.FindElementByAccessibilityId("ShowWindow");
-            
+            var extendClientAreaCheckBox = _session.FindElementByAccessibilityId("ShowWindowExtendClientAreaToDecorationsHint");
+
             if (size.HasValue)
                 sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
 
@@ -366,9 +399,27 @@ namespace Avalonia.IntegrationTests.Appium
             if (canResizeCheckBox.GetIsChecked() != canResize)
                 canResizeCheckBox.Click();
 
+            if (extendClientAreaCheckBox.GetIsChecked() != extendClientArea)
+                extendClientAreaCheckBox.Click();
+
             return showButton.OpenWindowWithClick();
         }
 
+        private AppiumWebElement GetWindow(string identifier)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // The Avalonia a11y tree currently exposes two nested Window elements, this is a bug and should be fixed 
+                // but in the meantime use the `parent::' selector to return the parent "real" window. 
+                return _session.FindElementByXPath(
+                    $"XCUIElementTypeWindow//*[@identifier='{identifier}']/parent::XCUIElementTypeWindow");
+            }
+            else
+            {
+                return _session.FindElementByXPath($"//Window[@AutomationId='{identifier}']");
+            }
+        }
+
         private WindowInfo GetWindowInfo()
         {
             PixelRect? ReadOwnerRect()
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
index 68a31c7ccb..247198b254 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
@@ -336,22 +336,6 @@ namespace Avalonia.IntegrationTests.Appium
             secondaryWindow.FindElementByAccessibilityId("_XCUI:CloseWindow").Click();
         }
 
-        [PlatformTheory(TestPlatforms.MacOS)]
-        [InlineData(ShowWindowMode.NonOwned)]
-        [InlineData(ShowWindowMode.Owned)]
-        [InlineData(ShowWindowMode.Modal)]
-        public void Window_Has_Disabled_Zoom_Button_When_CanResize_Is_False(ShowWindowMode mode)
-        {
-            using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false))
-            {
-                var secondaryWindow = GetWindow("SecondaryWindow");
-                var zoomButton = mode == ShowWindowMode.NonOwned ?
-                    secondaryWindow.FindElementByAccessibilityId("_XCUI:FullScreenWindow") :
-                    secondaryWindow.FindElementByAccessibilityId("_XCUI:ZoomWindow");
-                Assert.False(zoomButton.Enabled);
-            }
-        }
-
         [PlatformFact(TestPlatforms.MacOS)]
         public void Toggling_SystemDecorations_Should_Preserve_ExtendClientArea()
         {

From b46573c52fab0186b717fec2a52284f4d2c6b1ac Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 29 Mar 2023 19:33:32 +0200
Subject: [PATCH 4/7] Disable maximize button when CanResize=false.

---
 .../Chrome/CaptionButtons.cs                  | 29 ++++++++++++++-----
 .../Controls/CaptionButtons.xaml              |  3 ++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
index f5fcbed9fb..90dd14c703 100644
--- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -15,6 +15,7 @@ namespace Avalonia.Controls.Chrome
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class CaptionButtons : TemplatedControl
     {
+        private Button? _restoreButton;
         private IDisposable? _disposables;
 
         /// <summary>
@@ -28,14 +29,23 @@ namespace Avalonia.Controls.Chrome
             {
                 HostWindow = hostWindow;
 
-                _disposables = HostWindow.GetObservable(Window.WindowStateProperty)
-                    .Subscribe(x =>
-                    {
-                        PseudoClasses.Set(":minimized", x == WindowState.Minimized);
-                        PseudoClasses.Set(":normal", x == WindowState.Normal);
-                        PseudoClasses.Set(":maximized", x == WindowState.Maximized);
-                        PseudoClasses.Set(":fullscreen", x == WindowState.FullScreen);
-                    });
+                _disposables = new CompositeDisposable
+                {
+                    HostWindow.GetObservable(Window.CanResizeProperty)
+                        .Subscribe(x =>
+                        {
+                            if (_restoreButton is not null)
+                                _restoreButton.IsEnabled = x;
+                        }),
+                    HostWindow.GetObservable(Window.WindowStateProperty)
+                        .Subscribe(x =>
+                        {
+                            PseudoClasses.Set(":minimized", x == WindowState.Minimized);
+                            PseudoClasses.Set(":normal", x == WindowState.Normal);
+                            PseudoClasses.Set(":maximized", x == WindowState.Maximized);
+                            PseudoClasses.Set(":fullscreen", x == WindowState.FullScreen);
+                        }),
+                };
             }
         }
 
@@ -94,6 +104,9 @@ namespace Avalonia.Controls.Chrome
             restoreButton.Click += (sender, e) => OnRestore();
             minimiseButton.Click += (sender, e) => OnMinimize();
             fullScreenButton.Click += (sender, e) => OnToggleFullScreen();
+
+            restoreButton.IsEnabled = HostWindow?.CanResize ?? true;
+            _restoreButton = restoreButton;
         }
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 7ce775e4c2..666717acde 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -96,5 +96,8 @@
     <Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton">
       <Setter Property="IsVisible" Value="False" />
     </Style>
+    <Style Selector="^ /template/ Button#PART_RestoreButton:disabled">
+      <Setter Property="Opacity" Value="0.2"/>
+    </Style>
   </ControlTheme>
 </ResourceDictionary>

From fd5a3168b737c30067b3c9692fbcb1e2dbf0c143 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:58:41 +0200
Subject: [PATCH 5/7] Update simple theme caption buttons.

---
 .../Controls/CaptionButtons.xaml                     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
index 4522ffac87..040de9ddbd 100644
--- a/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
@@ -54,7 +54,8 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_MinimiseButton"
-                  Theme="{StaticResource SimpleCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}"
+                  AutomationProperties.Name="Minimise">
             <Viewbox Width="11"
                      Margin="2">
               <Path Data="M2048 1229v-205h-2048v205h2048z"
@@ -63,7 +64,8 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_RestoreButton"
-                  Theme="{StaticResource SimpleCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}"
+                  AutomationProperties.Name="Maximise">
             <Viewbox Width="11"
                      Margin="2">
               <Viewbox.RenderTransform>
@@ -78,7 +80,8 @@
           <Button x:Name="PART_CloseButton"
                   Background="#ffe81123"
                   BorderBrush="#fff1707a"
-                  Theme="{StaticResource SimpleCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}"
+                  AutomationProperties.Name="Close">
             <Viewbox Width="11"
                      Margin="2">
               <Path Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z"
@@ -102,5 +105,8 @@
     <Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton">
       <Setter Property="IsVisible" Value="False" />
     </Style>
+    <Style Selector="^ /template/ Button#PART_RestoreButton:disabled">
+      <Setter Property="Opacity" Value="0.2"/>
+    </Style>
   </ControlTheme>
 </ResourceDictionary>

From cdbe84b774a8d360030e30fa21de25df3d6e2a29 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 4 Apr 2023 18:39:30 +0200
Subject: [PATCH 6/7] Remove debug code.

---
 tests/Avalonia.IntegrationTests.Appium/WindowTests.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index a0ecd1f2d0..46ded3233c 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -266,7 +266,6 @@ namespace Avalonia.IntegrationTests.Appium
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    var foo = _session.PageSource;
                     maximizeButton = secondaryWindow.FindElementByXPath("//Button[@Name='Maximise']");
                 }
                 else

From 4740d0c63a484c993584e99d4cf570ffbac6bfe2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 4 Apr 2023 23:10:32 +0200
Subject: [PATCH 7/7] Get window chrome maximize button by index.

The real Windows Maximize button has no automation ID and is localized. Get it by index instead of by name. The Avalonia one isn't localized so we can get it by name.
---
 tests/Avalonia.IntegrationTests.Appium/WindowTests.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index 46ded3233c..d955df13ef 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -1,18 +1,14 @@
 using System;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia.Controls;
-using Avalonia.Utilities;
-using Avalonia.Media.Imaging;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Interactions;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 using Xunit.Sdk;
-using OpenQA.Selenium.Appium.Interfaces;
 
 namespace Avalonia.IntegrationTests.Appium
 {
@@ -266,7 +262,9 @@ namespace Avalonia.IntegrationTests.Appium
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    maximizeButton = secondaryWindow.FindElementByXPath("//Button[@Name='Maximise']");
+                    maximizeButton = extendClientArea ?
+                        secondaryWindow.FindElementByXPath("//Button[@Name='Maximise']") :
+                        secondaryWindow.FindElementByXPath("//TitleBar/Button[2]");
                 }
                 else
                 {