Merge pull request AvaloniaUI#8257 from AvaloniaUI/fixes/osx-toolbar-hint

Fixes/osx toolbar hint

Author: danwalmsley

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

@@ -32,6 +32,7 @@ @implementation CLASS_NAME
     bool _isEnabled;
     bool _canBecomeKeyWindow;
     bool _isExtended;
+    bool _isTransitioningToFullScreen;
     AvnMenu* _menu;
 }
 
@@ -174,6 +175,7 @@ -(CLASS_NAME*_Nonnull)  initWithParent: (WindowBaseImpl*_Nonnull) parent content
     [self setBackgroundColor: [NSColor clearColor]];
 
     _isExtended = false;
+    _isTransitioningToFullScreen = false;
 
     if(self.isDialog)
     {
@@ -348,6 +350,7 @@ - (void)windowDidExitFullScreen:(NSNotification *_Nonnull)notification
 
 - (void)windowWillEnterFullScreen:(NSNotification *_Nonnull)notification
 {
+    _isTransitioningToFullScreen = true;
     auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
 
     if(parent != nullptr)
@@ -358,6 +361,7 @@ - (void)windowWillEnterFullScreen:(NSNotification *_Nonnull)notification
 
 - (void)windowDidEnterFullScreen:(NSNotification *_Nonnull)notification
 {
+    _isTransitioningToFullScreen = false;
     auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
 
     if(parent != nullptr)
@@ -440,7 +444,10 @@ - (void)sendEvent:(NSEvent *_Nonnull)event
                     _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
                 }
 
-                _parent->BringToFront();
+                if(!_isTransitioningToFullScreen)
+                {
+                    _parent->BringToFront();
+                }
             }
             break;
 

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

@@ -89,8 +89,6 @@
     START_COM_CALL;
 
     @autoreleasepool {
-        InitialiseNSWindow();
-
         if(hasPosition)
         {
             SetPosition(lastPositionSet);

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

@@ -31,11 +31,11 @@
     }
 
     bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations != SystemDecorationsFull;
+    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
 
-    [[Window standardWindowButton:NSWindowCloseButton] setHidden:hasTrafficLights];
-    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:hasTrafficLights];
-    [[Window standardWindowButton:NSWindowZoomButton] setHidden:hasTrafficLights];
+    [[Window standardWindowButton:NSWindowCloseButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowZoomButton] setHidden:!hasTrafficLights];
 }
 
 void WindowImpl::OnInitialiseNSWindow(){

samples/ControlCatalog/MainWindow.xaml.cs

@@ -32,8 +32,6 @@ public MainWindow()
 
             DataContext = new MainWindowViewModel(_notificationArea);
             _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
-
-            ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.OSXThickTitleBar;
         }
 
         public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";