From 02b3bf253af52c3c08ade06fba827dce7d3cf93b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 24 May 2022 20:50:39 +0100
Subject: [PATCH] add OnInitialiseNSWindow to allow inheritors to hook into
 NSWindow/Panel setup before being shown.

---
 native/Avalonia.Native/src/OSX/PopupImpl.mm   |  8 +++--
 .../Avalonia.Native/src/OSX/WindowBaseImpl.h  |  2 ++
 .../Avalonia.Native/src/OSX/WindowBaseImpl.mm |  7 +++++
 native/Avalonia.Native/src/OSX/WindowImpl.h   |  2 ++
 native/Avalonia.Native/src/OSX/WindowImpl.mm  | 29 ++++++++++---------
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
index cb52047148..3c5afd9424 100644
--- a/native/Avalonia.Native/src/OSX/PopupImpl.mm
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -26,13 +26,17 @@ private:
     PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
     {
         WindowEvents = events;
-        [Window setLevel:NSPopUpMenuWindowLevel];
     }
 protected:
     virtual NSWindowStyleMask GetStyle() override
     {
         return NSWindowStyleMaskBorderless;
     }
+    
+    virtual void OnInitialiseNSWindow () override
+    {
+        [Window setLevel:NSPopUpMenuWindowLevel];
+    }
 
 public:
     virtual bool ShouldTakeFocusOnShow() override
@@ -54,4 +58,4 @@ extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
         IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
         return ptr;
     }
-}
\ No newline at end of file
+}
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index a879fecc21..83850e780c 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -104,6 +104,8 @@ protected:
     virtual NSWindowStyleMask GetStyle();
 
     void UpdateStyle();
+                           
+    virtual void OnInitialiseNSWindow ();
 
 private:
     void CreateNSWindow (bool isDialog);
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index c97989556f..022769bad0 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -567,6 +567,11 @@ void WindowBaseImpl::CreateNSWindow(bool isDialog) {
     }
 }
 
+void WindowBaseImpl::OnInitialiseNSWindow()
+{
+    
+}
+
 void WindowBaseImpl::InitialiseNSWindow() {
     if(Window != nullptr) {
         [Window setContentView:StandardContainer];
@@ -586,6 +591,8 @@ void WindowBaseImpl::InitialiseNSWindow() {
                 [GetWindowProtocol() showWindowMenuWithAppMenu];
             }
         }
+        
+        OnInitialiseNSWindow();
     }
 }
 
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index dc82ee59c2..db19497b29 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -88,6 +88,8 @@ BEGIN_INTERFACE_MAP()
     virtual HRESULT SetWindowState (AvnWindowState state) override;
 
     virtual bool IsDialog() override;
+    
+    virtual void OnInitialiseNSWindow() override;
 
 protected:
     virtual NSWindowStyleMask GetStyle() override;
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 5bb739d369..d43a8beee4 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -21,9 +21,6 @@ WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBase
     _actualWindowState = Normal;
     _lastTitle = @"";
     WindowEvents = events;
-    [Window disableCursorRects];
-    [Window setTabbingMode:NSWindowTabbingModeDisallowed];
-    [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 }
 
 void WindowImpl::HideOrShowTrafficLights() {
@@ -51,25 +48,29 @@ void WindowImpl::HideOrShowTrafficLights() {
     }
 }
 
+void WindowImpl::OnInitialiseNSWindow(){
+    [GetWindowProtocol() setCanBecomeKeyWindow:true];
+    [Window disableCursorRects];
+    [Window setTabbingMode:NSWindowTabbingModeDisallowed];
+    [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+
+    [Window setTitle:_lastTitle];
+    
+    if(_isClientAreaExtended)
+    {
+        [GetWindowProtocol() setIsExtended:true];
+        SetExtendClientArea(true);
+    }
+}
+
 HRESULT WindowImpl::Show(bool activate, bool isDialog) {
     START_COM_CALL;
 
     @autoreleasepool {
         _isDialog = isDialog;
 
-        bool created = Window == nullptr;
-
         WindowBaseImpl::Show(activate, isDialog);
 
-        if(created)
-        {
-            if(_isClientAreaExtended)
-            {
-                [GetWindowProtocol() setIsExtended:true];
-                SetExtendClientArea(true);
-            }
-        }
-
         HideOrShowTrafficLights();
 
         return SetWindowState(_lastWindowState);