Merge pull request #6803 from AvaloniaUI/fixes/osx/non-client-clicks-…

…popup-crash [OSX] fix non-client click detection causing crash on popups.
AvaloniaUI · Oct 27, 2021 · b03c0b0 · b03c0b0
1 parent 6dbf015
commit b03c0b0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
@@ -2389,7 +2389,10 @@ - (AvnPoint) translateLocalPoint:(AvnPoint)pt
 
 - (void)sendEvent:(NSEvent *)event
 {
-    if(_parent != nullptr)
+    [super sendEvent:event];
+
+    /// This is to detect non-client clicks. This can only be done on Windows... not popups, hence the dynamic_cast.
+    if(_parent != nullptr && dynamic_cast<WindowImpl*>(_parent.getRaw()) != nullptr)
     {
         switch(event.type)
         {
@@ -2419,8 +2422,6 @@ - (void)sendEvent:(NSEvent *)event
                 break;
         }
     }
-
-    [super sendEvent:event];
 }
 @end