From d40041f02dd8ae5e53074e3b4c3e47b420ff9457 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 6 Feb 2023 19:13:59 +0100
Subject: [PATCH] GetStyle => abstract CalculateStyleMask.

- Make naming more clear - it's not getting the style mask, it's calculating what it should be in order to update the mask
- Make it abstract to prevent it being called from the ctor in future
---
 native/Avalonia.Native/src/OSX/PopupImpl.mm      |  2 +-
 native/Avalonia.Native/src/OSX/WindowBaseImpl.h  |  2 +-
 native/Avalonia.Native/src/OSX/WindowBaseImpl.mm | 10 +---------
 native/Avalonia.Native/src/OSX/WindowImpl.h      |  2 +-
 native/Avalonia.Native/src/OSX/WindowImpl.mm     |  2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
index 9820a9f052e..972d03d08c6 100644
--- a/native/Avalonia.Native/src/OSX/PopupImpl.mm
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -29,7 +29,7 @@
         [Window setLevel:NSPopUpMenuWindowLevel];
     }
 protected:
-    virtual NSWindowStyleMask GetStyle() override
+    virtual NSWindowStyleMask CalculateStyleMask() override
     {
         return NSWindowStyleMaskBorderless;
     }
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index afa3a2956fe..93decef1362 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -105,7 +105,7 @@ BEGIN_INTERFACE_MAP()
     virtual void BringToFront ();
 
 protected:
-    virtual NSWindowStyleMask GetStyle();
+    virtual NSWindowStyleMask CalculateStyleMask() = 0;
     virtual void UpdateStyle();
 
 private:
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 4d3768a4a86..59102e15a6b 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -35,18 +35,14 @@
     lastSize = NSSize { 100, 100 };
     lastMaxSize = NSSize { CGFLOAT_MAX, CGFLOAT_MAX};
     lastMinSize = NSSize { 0, 0 };
-
     lastMenu = nullptr;
     
     CreateNSWindow(usePanel);
     
     [Window setContentView:StandardContainer];
-    [Window setStyleMask:NSWindowStyleMaskBorderless];
     [Window setBackingType:NSBackingStoreBuffered];
-
     [Window setContentMinSize:lastMinSize];
     [Window setContentMaxSize:lastMaxSize];
-
     [Window setOpaque:false];
 }
 
@@ -564,12 +560,8 @@
     return false;
 }
 
-NSWindowStyleMask WindowBaseImpl::GetStyle() {
-    return NSWindowStyleMaskBorderless;
-}
-
 void WindowBaseImpl::UpdateStyle() {
-    [Window setStyleMask:GetStyle()];
+    [Window setStyleMask:CalculateStyleMask()];
 }
 
 void WindowBaseImpl::CleanNSWindow() {
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index e7e9b7f1d8e..9c684c77c42 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -98,7 +98,7 @@ BEGIN_INTERFACE_MAP()
     bool CanBecomeKeyWindow ();
 
 protected:
-    virtual NSWindowStyleMask GetStyle() override;
+    virtual NSWindowStyleMask CalculateStyleMask() override;
     void UpdateStyle () override;
 
 private:
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index ae3e1eaf1d7..afd9c1a5eab 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -553,7 +553,7 @@
     return _parent != nullptr;
 }
 
-NSWindowStyleMask WindowImpl::GetStyle() {
+NSWindowStyleMask WindowImpl::CalculateStyleMask() {
     unsigned long s = NSWindowStyleMaskBorderless;
     
     if(_actualWindowState == FullScreen)