From 7225a369d86a1ccc3128908ecd8ae00cf52cdac8 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 4 Oct 2018 20:10:16 +0100
Subject: [PATCH 1/2] fix building inside vs for mac.

---
 src/Avalonia.Native/Avalonia.Native.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index efe6896b88..1863d4a2c2 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -21,7 +21,7 @@
       <Compile Remove="Generated\Structures.cs" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(Configuration)' == 'Release'">
       <Content Include="../../Build/Products/Release/libAvalonia.Native.OSX.dylib">
         <PackagePath>runtimes/osx/native/libAvaloniaNative.dylib</PackagePath>
         <Pack>true</Pack>

From 2758a5839e6e9f7234b3c6d5684fce74b384b471 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 4 Oct 2018 21:21:52 +0100
Subject: [PATCH 2/2] add a modal window implementation

---
 samples/ControlCatalog/Pages/DialogsPage.xaml |  1 +
 .../ControlCatalog/Pages/DialogsPage.xaml.cs  | 13 ++++
 src/Avalonia.Native.OSX/window.h              |  1 +
 src/Avalonia.Native.OSX/window.mm             | 63 +++++++++++++++++++
 src/Avalonia.Native/WindowImpl.cs             |  2 +-
 src/headers/avalonia-native.h                 |  2 +-
 6 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 710d791f3a..fe42a08087 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -8,5 +8,6 @@
           <TextBlock>Modal to window</TextBlock>
       </StackPanel>
       <Button Name="DecoratedWindow">Decorated window</Button>
+      <Button Name="ChildWindow">Child window</Button>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index 8b3e810f0a..520fd1b925 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -34,6 +34,19 @@ namespace ControlCatalog.Pages
             {
                 new DecoratedWindow().Show();
             };
+            this.FindControl<Button>("ChildWindow").Click += delegate
+            {
+
+                var window = new Window
+                {
+                    Height = 200,
+                    Width = 200,
+                    Content = new Button{ Content = "Test"}
+                };
+
+                window.ShowDialog();
+
+            };
         }
 
         Window GetWindow() => this.FindControl<CheckBox>("IsModal").IsChecked.Value ? (Window)this.VisualRoot : null;
diff --git a/src/Avalonia.Native.OSX/window.h b/src/Avalonia.Native.OSX/window.h
index a21c90f4e6..e0aaa5bb4e 100644
--- a/src/Avalonia.Native.OSX/window.h
+++ b/src/Avalonia.Native.OSX/window.h
@@ -21,6 +21,7 @@ class WindowBaseImpl;
 @interface AvnWindow : NSWindow <NSWindowDelegate>
 -(AvnWindow*) initWithParent: (WindowBaseImpl*) parent;
 -(void) setCanBecomeKeyAndMain;
+-(void) pollModalSession: (nonnull NSModalSession) session;
 @end
 
 struct INSWindowHolder
diff --git a/src/Avalonia.Native.OSX/window.mm b/src/Avalonia.Native.OSX/window.mm
index 315bb94ee1..bed6febdc5 100644
--- a/src/Avalonia.Native.OSX/window.mm
+++ b/src/Avalonia.Native.OSX/window.mm
@@ -610,6 +610,23 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     bool _canBecomeKeyAndMain;
 }
 
+- (void)pollModalSession:(nonnull NSModalSession)session
+{
+    auto response = [NSApp runModalSession:session];
+    
+    if(response == NSModalResponseContinue)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self pollModalSession:session];
+        });
+    }
+    else
+    {
+        [self orderOut:self];
+        [NSApp endModalSession:session];
+    }
+}
+
 -(void) setCanBecomeKeyAndMain
 {
     _canBecomeKeyAndMain = true;
@@ -697,6 +714,30 @@ extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events)
     return ptr;
 }
 
+class ModalDisposable : public ComUnknownObject
+{
+    NSModalSession _session;
+    AvnWindow* _window;
+    
+    void Dispose ()
+    {
+        [_window orderOut:_window];
+        [NSApp endModalSession:_session];
+    }
+    
+public:
+    ModalDisposable(AvnWindow* window, NSModalSession session)
+    {
+        _session = session;
+        _window = window;
+    }
+    
+    virtual ~ModalDisposable()
+    {
+        Dispose();
+    }
+};
+
 class WindowImpl : public WindowBaseImpl, public IAvnWindow, public IWindowStateChanged
 {
 private:
@@ -716,6 +757,28 @@ private:
         [Window setCanBecomeKeyAndMain];
     }
     
+    virtual HRESULT ShowDialog (IUnknown**ppv)
+    {
+        @autoreleasepool
+        {
+            if(ppv == nullptr)
+            {
+                return E_POINTER;
+            }
+            
+            auto session = [NSApp beginModalSessionForWindow:Window];
+            auto disposable = new ModalDisposable(Window, session);
+            *ppv = disposable;
+            
+            SetPosition(lastPositionSet);
+            UpdateStyle();
+            
+            [Window pollModalSession:session];
+            
+            return S_OK;
+        }
+    }
+    
     void WindowStateChanged ()
     {
         AvnWindowState state;
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index 7d1b1e2f50..8a2b0a2af4 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Native
 
         public IDisposable ShowDialog()
         {
-            return null;
+            return _native.ShowDialog();
         }
 
 
diff --git a/src/headers/avalonia-native.h b/src/headers/avalonia-native.h
index d51629052e..23079f49fa 100644
--- a/src/headers/avalonia-native.h
+++ b/src/headers/avalonia-native.h
@@ -136,6 +136,7 @@ AVNCOM(IAvnPopup, 03) : virtual IAvnWindowBase
 
 AVNCOM(IAvnWindow, 04) : virtual IAvnWindowBase
 {
+    virtual HRESULT ShowDialog (IUnknown**ppv) = 0;
     virtual HRESULT SetCanResize(bool value) = 0;
     virtual HRESULT SetHasDecorations(bool value) = 0;
     virtual HRESULT SetWindowState(AvnWindowState state) = 0;
@@ -182,7 +183,6 @@ AVNCOM(IAvnSignaledCallback, 09) : IUnknown
     virtual void Signaled(int priority, bool priorityContainsMeaningfulValue) = 0;
 };
 
-
 AVNCOM(IAvnLoopCancellation, 0a) : virtual IUnknown
 {
     virtual void Cancel() = 0;