Merge pull request AvaloniaUI#8255 from AvaloniaUI/fixes/osx-extended-wants-chrome-hint

danwalmsley · danwalmsley · commit 4d99ad1ea866 · 2022-06-03T11:50:54.000+01:00
OSX: fix logic for deciding if chrome buttons should be shown or not in ex…
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -31,7 +31,7 @@
     }
 
     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];

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`bool wantsChrome = (_extendClientHints & AvnSystemChrome) \|\| (_extendClientHints & AvnPreferSystemChrome);`
`34`		`- bool hasTrafficLights = _isClientAreaExtended ? !wantsChrome : _decorations != SystemDecorationsFull;`
	`34`	`+ bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations != SystemDecorationsFull;`
`35`	`35`
`36`	`36`	`[[Window standardWindowButton:NSWindowCloseButton] setHidden:hasTrafficLights];`
`37`	`37`	`[[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:hasTrafficLights];`