[RFC] Add Window.CanMinimize/CanMaximize

native/Avalonia.Native/src/OSX/WindowImpl.h

@@ -45,6 +45,10 @@ BEGIN_INTERFACE_MAP()
     void DoZoom();
 
     virtual HRESULT SetCanResize(bool value) override;
+
+    virtual HRESULT SetCanMinimize(bool value) override;
+
+    virtual HRESULT SetCanMaximize(bool value) override;
 
     virtual HRESULT SetDecorations(SystemDecorations value) override;
 
@@ -80,7 +84,7 @@ BEGIN_INTERFACE_MAP()
 
     bool CanBecomeKeyWindow ();
 
-    bool CanZoom() override { return _isEnabled && _canResize; }
+    bool CanZoom() override { return _isEnabled && _canMaximize; }
 
 protected:
     virtual NSWindowStyleMask CalculateStyleMask() override;
@@ -92,6 +96,8 @@ BEGIN_INTERFACE_MAP()
     NSString *_lastTitle;
     bool _isEnabled;
     bool _canResize;
+    bool _canMinimize;
+    bool _canMaximize;
     bool _fullScreenActive;
     SystemDecorations _decorations;
     AvnWindowState _lastWindowState;

native/Avalonia.Native/src/OSX/WindowImpl.mm

@@ -16,6 +16,8 @@
     _extendClientHints = AvnDefaultChrome;
     _fullScreenActive = false;
     _canResize = true;
+    _canMinimize = true;
+    _canMaximize = true;
     _decorations = SystemDecorationsFull;
     _transitioningWindowState = false;
     _inSetWindowState = false;
@@ -191,7 +193,8 @@
 void WindowImpl::DoZoom() {
     if (_decorations == SystemDecorationsNone ||
         _decorations == SystemDecorationsBorderOnly ||
-        _canResize == false) {
+        _canResize == false ||
+        _canMaximize == false) {
         [Window setFrame:[Window screen].visibleFrame display:true];
     } else {
         [Window performZoom:Window];
@@ -208,6 +211,22 @@
     }
 }
 
+HRESULT WindowImpl::SetCanMinimize(bool value) {
+    START_COM_ARP_CALL;
+
+    _canMinimize = value;
+    UpdateAppearance();
+    return S_OK;
+}
+
+HRESULT WindowImpl::SetCanMaximize(bool value) {
+    START_COM_ARP_CALL;
+
+    _canMaximize = value;
+    UpdateAppearance();
+    return S_OK;
+}
+
 HRESULT WindowImpl::SetDecorations(SystemDecorations value) {
     START_COM_CALL;
 
@@ -577,7 +596,7 @@
             break;
     }
 
-    if (!IsOwned()) {
+    if (_canMinimize && !IsOwned()) {
         s |= NSWindowStyleMaskMiniaturizable;
     }
 
@@ -605,9 +624,9 @@
     [closeButton setHidden:!hasTrafficLights];
     [closeButton setEnabled:_isEnabled];
     [miniaturizeButton setHidden:!hasTrafficLights];
-    [miniaturizeButton setEnabled:_isEnabled];
+    [miniaturizeButton setEnabled:_isEnabled && _canMinimize];
     [zoomButton setHidden:!hasTrafficLights];
-    [zoomButton setEnabled:CanZoom()];
+    [zoomButton setEnabled:CanZoom() || (([Window styleMask] & NSWindowStyleMaskFullScreen) != 0 && _isEnabled)];
 }
 
 extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events)

samples/ControlCatalog/MainWindow.xaml

@@ -10,6 +10,9 @@
         ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}"
         ExtendClientAreaChromeHints="{Binding ChromeHints}"
         ExtendClientAreaTitleBarHeightHint="{Binding TitleBarHeight}"
+        CanResize="{Binding CanResize}"
+        CanMinimize="{Binding CanMinimize}"
+        CanMaximize="{Binding CanMaximize}"
         x:Name="MainWindow"
         Background="Transparent"
         x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}"

samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml

@@ -8,18 +8,55 @@
              x:DataType="viewModels:MainWindowViewModel"
              x:CompileBindings="True">
   <StackPanel>
-    <StackPanel Spacing="10" Margin="25" IsEnabled="{OnFormFactor false, Desktop=true}">
-      <TextBlock Classes="h2" Text="Desktop properties" Margin="4" />
-      <CheckBox Content="Extend Client Area to Decorations" IsChecked="{Binding ExtendClientAreaEnabled}" />
-      <CheckBox Content="Title Bar" IsChecked="{Binding SystemTitleBarEnabled}" />
-      <CheckBox Content="Prefer System Chrome" IsChecked="{Binding PreferSystemChromeEnabled}" />
-      <Slider Minimum="-1" Maximum="200" Value="{Binding TitleBarHeight}" />
+
+    <StackPanel
+      Spacing="10"
+      Margin="25"
+      IsEnabled="{OnFormFactor false, Desktop=true}">
+
+      <TextBlock Classes="h2"
+                 Text="Desktop properties"
+                 Margin="4" />
+
+      <CheckBox Content="Extend Client Area to Decorations"
+                IsChecked="{Binding ExtendClientAreaEnabled}" />
+
+      <DockPanel IsEnabled="{Binding ExtendClientAreaEnabled}">
+
+        <CheckBox Content="Title Bar"
+                  IsChecked="{Binding SystemTitleBarEnabled}"
+                  DockPanel.Dock="Left" />
+
+        <Slider Minimum="-1"
+                Maximum="200"
+                Value="{Binding TitleBarHeight}"
+                IsEnabled="{Binding SystemTitleBarEnabled}"
+                Margin="8,-10" />
+
+      </DockPanel>
+
+      <CheckBox Content="Prefer System Chrome"
+                IsChecked="{Binding PreferSystemChromeEnabled}"
+                IsEnabled="{Binding ExtendClientAreaEnabled}" />
+
+      <CheckBox Content="Can Resize"
+                IsChecked="{Binding CanResize}" />
+
+      <CheckBox Content="Can Minimize"
+                IsChecked="{Binding CanMinimize}" />
+
+      <CheckBox Content="Can Maximize"
+                IsChecked="{Binding CanMaximize}"
+                IsEnabled="{Binding CanResize}" />
+
     </StackPanel>
+
     <StackPanel Spacing="10" Margin="25" IsEnabled="{OnFormFactor false, Mobile=true}">
       <TextBlock Classes="h2" Text="Mobile properties" Margin="4" />
       <CheckBox Content="Is System Bar Visible" IsChecked="{Binding IsSystemBarVisible}" />
       <CheckBox Content="Display Edge To Edge" IsChecked="{Binding DisplayEdgeToEdge}" />
       <TextBlock Text="{Binding SafeAreaPadding, StringFormat='Safe Area Padding: {0}'}" />
     </StackPanel>
+
   </StackPanel>
 </UserControl>

samples/ControlCatalog/ViewModels/MainWindowViewModel.cs

@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Controls.Notifications;
 using Avalonia.Dialogs;
 using Avalonia.Platform;
 using System;
@@ -22,6 +21,9 @@ class MainWindowViewModel : ViewModelBase
         private bool _isSystemBarVisible;
         private bool _displayEdgeToEdge;
         private Thickness _safeAreaPadding;
+        private bool _canResize;
+        private bool _canMinimize;
+        private bool _canMaximize;
 
         public MainWindowViewModel()
         {
@@ -49,7 +51,7 @@ public MainWindowViewModel()
                 WindowState.FullScreen,
             };
 
-            this.PropertyChanged += (s, e) =>
+            PropertyChanged += (s, e) =>
                 {
                     if (e.PropertyName is nameof(SystemTitleBarEnabled) or nameof(PreferSystemChromeEnabled))
                     {
@@ -67,70 +69,104 @@ public MainWindowViewModel()
                     }
                 };
 
-            SystemTitleBarEnabled = true;            
+            SystemTitleBarEnabled = true;
             TitleBarHeight = -1;
+            CanResize = true;
+            CanMinimize = true;
+            CanMaximize = true;
         }        
 
         public ExtendClientAreaChromeHints ChromeHints
         {
             get { return _chromeHints; }
-            set { this.RaiseAndSetIfChanged(ref _chromeHints, value); }
+            set { RaiseAndSetIfChanged(ref _chromeHints, value); }
         }
 
         public bool ExtendClientAreaEnabled
         {
             get { return _extendClientAreaEnabled; }
-            set { this.RaiseAndSetIfChanged(ref _extendClientAreaEnabled, value); }
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _extendClientAreaEnabled, value) && !value)
+                {
+                    SystemTitleBarEnabled = true;
+                }
+            }
         }
 
         public bool SystemTitleBarEnabled
         {
             get { return _systemTitleBarEnabled; }
-            set { this.RaiseAndSetIfChanged(ref _systemTitleBarEnabled, value); }
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _systemTitleBarEnabled, value) && !value)
+                {
+                    TitleBarHeight = -1;
+                }
+            }
         }
 
         public bool PreferSystemChromeEnabled
         {
             get { return _preferSystemChromeEnabled; }
-            set { this.RaiseAndSetIfChanged(ref _preferSystemChromeEnabled, value); }
+            set { RaiseAndSetIfChanged(ref _preferSystemChromeEnabled, value); }
         }
 
         public double TitleBarHeight
         {
             get { return _titleBarHeight; }
-            set { this.RaiseAndSetIfChanged(ref _titleBarHeight, value); }
+            set { RaiseAndSetIfChanged(ref _titleBarHeight, value); }
         }
 
         public WindowState WindowState
         {
             get { return _windowState; }
-            set { this.RaiseAndSetIfChanged(ref _windowState, value); }
+            set { RaiseAndSetIfChanged(ref _windowState, value); }
         }
 
         public WindowState[] WindowStates
         {
             get { return _windowStates; }
-            set { this.RaiseAndSetIfChanged(ref _windowStates, value); }
+            set { RaiseAndSetIfChanged(ref _windowStates, value); }
         }
 
         public bool IsSystemBarVisible
         {
             get { return _isSystemBarVisible; }
-            set { this.RaiseAndSetIfChanged(ref _isSystemBarVisible, value); }
+            set { RaiseAndSetIfChanged(ref _isSystemBarVisible, value); }
         }
 
         public bool DisplayEdgeToEdge
         {
             get { return _displayEdgeToEdge; }
-            set { this.RaiseAndSetIfChanged(ref _displayEdgeToEdge, value); }
+            set { RaiseAndSetIfChanged(ref _displayEdgeToEdge, value); }
         }
 
         public Thickness SafeAreaPadding
         {
             get { return _safeAreaPadding; }
-            set { this.RaiseAndSetIfChanged(ref _safeAreaPadding, value); }
+            set { RaiseAndSetIfChanged(ref _safeAreaPadding, value); }
+        }
+
+        public bool CanResize
+        {
+            get { return _canResize; }
+            set { RaiseAndSetIfChanged(ref _canResize, value); }
+        }
+
+        public bool CanMinimize
+        {
+            get { return _canMinimize; }
+            set { RaiseAndSetIfChanged(ref _canMinimize, value); }
         }
 
+        public bool CanMaximize
+        {
+            get { return _canMaximize; }
+            set { RaiseAndSetIfChanged(ref _canMaximize, value); }
+        }
+
+
         public MiniCommand AboutCommand { get; }
 
         public MiniCommand ExitCommand { get; }
@@ -144,7 +180,7 @@ public Thickness SafeAreaPadding
         public DateTime? ValidatedDateExample
         {
             get => _validatedDateExample;
-            set => this.RaiseAndSetIfChanged(ref _validatedDateExample, value);
+            set => RaiseAndSetIfChanged(ref _validatedDateExample, value);
         }
     }
 }