From 8a39240eea1f04a1d0971e3be2f693f97e56f985 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 31 May 2022 13:50:01 +0100
Subject: [PATCH] [osx] make bringtofront work correctly for owned and modal
 windows.

---
 native/Avalonia.Native/src/OSX/AvnView.mm    | 5 -----
 native/Avalonia.Native/src/OSX/AvnWindow.mm  | 9 +++------
 native/Avalonia.Native/src/OSX/WindowImpl.mm | 9 ++++++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index bbb4d59adb..5436ad22f3 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -300,11 +300,6 @@
 
 - (void)mouseDown:(NSEvent *)event
 {
-    if(_parent != nullptr)
-    {
-        _parent->BringToFront();
-    }
-    
     _isLeftPressed = true;
     _lastMouseDownEvent = event;
     [self mouseEvent:event withType:LeftButtonDown];
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 1445227cf5..60fdb26121 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -183,11 +183,6 @@
     return self;
 }
 
-- (void)mouseDown:(NSEvent *)event
-{
-    _parent->BringToFront();
-}
-
 - (BOOL)windowShouldClose:(NSWindow *)sender
 {
     auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
@@ -435,8 +430,10 @@
 
                     _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
                 }
+                
+                _parent->BringToFront();
             }
-                break;
+            break;
 
             case NSEventTypeMouseEntered:
             {
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 5333cb23c8..8330f4ed86 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -126,7 +126,14 @@ HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
 
 void WindowImpl::BringToFront()
 {
-    Activate();
+    if(IsDialog())
+    {
+        Activate();
+    }
+    else
+    {
+        [Window orderFront:nullptr];
+    }
     
     for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
     {