Merge branch 'main' into issue/AvaloniaUI#16583-focus-issues-mac

Author: teta2k

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

@@ -29,7 +29,7 @@
     _inResize = false;
     BaseEvents = events;
     View = [[AvnView alloc] initWithParent:this];
-    InputMethod = new AvnTextInputMethod(View);
+    InputMethod.setNoAddRef(new AvnTextInputMethod(View));
     StandardContainer = [[AutoFitContentView new] initWithContent:View];
 
     lastPositionSet = { 0, 0 };

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

@@ -13,6 +13,7 @@ class WindowOverlayImpl : public virtual WindowImpl
     NSView* canvasView;
     NSColorPanel* colorPanel;
     bool isTrackingMouse;
+    NSArray* eventMonitors;
     FORWARD_IUNKNOWN()
     BEGIN_INTERFACE_MAP()
     INHERIT_INTERFACE_MAP(WindowBaseImpl)
@@ -21,6 +22,7 @@ class WindowOverlayImpl : public virtual WindowImpl
     AvnInputModifiers GetCommandModifier(NSEventModifierFlags modFlag);
 public:
     WindowOverlayImpl(void* parentWindow, char* parentView, IAvnWindowEvents* events);
+    virtual ~WindowOverlayImpl();
     virtual bool IsOverlay() override;
     virtual HRESULT GetScaling(double *ret) override;
     virtual HRESULT PointToClient(AvnPoint point, AvnPoint *ret) override;
@@ -30,6 +32,7 @@ class WindowOverlayImpl : public virtual WindowImpl
     virtual HRESULT TakeScreenshot(void** ret, int* retLength) override;
     virtual HRESULT PickColor(AvnColor color, bool* cancel, AvnColor* ret) override;
     virtual HRESULT Activate() override;
+    virtual HRESULT Close() override;
 };
 
 #endif

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

@@ -1,6 +1,17 @@
 #include "WindowOverlayImpl.h"
 #include "WindowInterfaces.h"
 
+WindowOverlayImpl::~WindowOverlayImpl()
+{
+    [View removeFromSuperview];
+    [[NSNotificationCenter defaultCenter] removeObserver: View];
+
+    for (id monitor in eventMonitors)
+    {
+        [NSEvent removeMonitor: monitor];
+    }
+}
+
 WindowOverlayImpl::WindowOverlayImpl(void* parentWindow, char* parentView, IAvnWindowEvents *events) : WindowImpl(events), WindowBaseImpl(events, false, true) {
     this->parentWindow = (__bridge NSWindow*) parentWindow;
     this->parentView = FindNSView(this->parentWindow, [NSString stringWithUTF8String:parentView]);
@@ -23,7 +34,7 @@
     [[NSNotificationCenter defaultCenter] addObserver:View selector:@selector(overlayWindowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:this->parentWindow];
     [[NSNotificationCenter defaultCenter] addObserver:View selector:@selector(overlayWindowDidResignKey:) name:NSWindowDidResignKeyNotification object:this->parentWindow];
 
-    [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskMouseMoved handler:^NSEvent * (NSEvent * event) {
+    id mouseMovedMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskMouseMoved handler:^NSEvent * (NSEvent * event) {
         //NSLog(@"MONITOR mouseMoved START");
 
         if ([event window] != this->parentWindow)
@@ -73,7 +84,7 @@
         }
     }];
 
-    [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskLeftMouseDown handler:^NSEvent * (NSEvent * event) {
+    id leftMouseDownMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskLeftMouseDown handler:^NSEvent * (NSEvent * event) {
         NSLog(@"MONITOR mouseDown START");
 
         if ([event window] != this->parentWindow)
@@ -102,7 +113,7 @@
                 return event;
     }];
 
-    [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged handler:^NSEvent * (NSEvent * event) {
+    id keydownMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged handler:^NSEvent * (NSEvent * event) {
         bool handled = false;
         NSUInteger flags = [event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask;
 
@@ -189,6 +200,8 @@
             return event;
         }
     }];
+    
+    eventMonitors = [NSArray arrayWithObjects: mouseMovedMonitor, leftMouseDownMonitor, keydownMonitor, nil];
 }
 
 
@@ -239,6 +252,15 @@
     return S_OK;
 }
 
+HRESULT WindowOverlayImpl::Close()
+{
+    START_COM_CALL;
+    HRESULT result = WindowImpl::Close();
+    [View onClosed];
+    
+    return result;
+}
+
 HRESULT WindowOverlayImpl::PointToClient(AvnPoint point, AvnPoint *ret) {
     START_COM_CALL;