Closing should occur in ProcessEvents.

opentk · Apr 24, 2014 · 46856dc · 46856dc
1 parent ed87814
commit 46856dc
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs b/Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
@@ -100,11 +100,12 @@ static CocoaNativeWindow()
         private MacOSKeyMap keyMap = new MacOSKeyMap();
         private OpenTK.Input.KeyboardKeyEventArgs keyArgs = new OpenTK.Input.KeyboardKeyEventArgs();
         private KeyPressEventArgs keyPressArgs = new KeyPressEventArgs((char)0);
-        string title;
-        RectangleF normalBounds;
-        int normalLevel;
+        private string title;
+        private RectangleF normalBounds;
+        private int normalLevel;
+        private bool shouldClose;
 
-        const bool exclusiveFullscreen = true;
+        private const bool exclusiveFullscreen = false;
 
         public CocoaNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
         {
@@ -280,19 +281,7 @@ private void ResetTrackingArea()
 
         public void Close()
         {
-            // PerformClose is equivalent to pressing the close-button, which
-            // does not work in a borderless window. Handle this special case.
-            if (GetStyleMask() == NSWindowStyle.Borderless)
-            {
-                if (WindowShouldClose(IntPtr.Zero, IntPtr.Zero, IntPtr.Zero))
-                {
-                    Cocoa.SendVoid(windowInfo.Handle, selClose);
-                }
-            }
-            else
-            {
-                Cocoa.SendVoid(windowInfo.Handle, selPerformClose, windowInfo.Handle);
-            }
+            shouldClose = true;
         }
 
         private KeyModifiers GetModifiers(NSEventModifierMask mask)
@@ -462,6 +451,26 @@ public void ProcessEvents()
 
                 Cocoa.SendVoid(NSApplication.Handle, selSendEvent, e);
             }
+
+            // Handle closing
+            if (shouldClose)
+            {
+                shouldClose = false;
+
+                // PerformClose is equivalent to pressing the close-button, which
+                // does not work in a borderless window. Handle this special case.
+                if (GetStyleMask() == NSWindowStyle.Borderless)
+                {
+                    if (WindowShouldClose(IntPtr.Zero, IntPtr.Zero, IntPtr.Zero))
+                    {
+                        Cocoa.SendVoid(windowInfo.Handle, selClose);
+                    }
+                }
+                else
+                {
+                    Cocoa.SendVoid(windowInfo.Handle, selPerformClose, windowInfo.Handle);
+                }
+            }
         }
 
         public System.Drawing.Point PointToClient(System.Drawing.Point point)