ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 16:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closing should occur in ProcessEvents.

Browse source
This commit is contained in:
Olle Håkansson 2014-04-21 20:32:16 +02:00 committed by thefiddler
parent ed87814a7f
commit 46856dc21d
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
View file

@ -100,11 +100,12 @@ namespace OpenTK.Platform.MacOS
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 @@ namespace OpenTK.Platform.MacOS
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 @@ namespace OpenTK.Platform.MacOS
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)