ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 07:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Close CocoaNativeWindow in Dispose()

Browse source 
Also fix various memory management issues regarding the `MouseCursor`
and `Icon` properties.
This commit is contained in:
thefiddler 2014-07-22 16:29:21 +02:00
parent 7956126c8d
commit 0e40f63cf2
1 changed files with 78 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,7 @@ namespace OpenTK.Platform.MacOS
private CocoaWindowInfo windowInfo;
private IntPtr windowClass;
private IntPtr trackingArea;
private IntPtr current_icon_handle;
private bool disposed = false;
private bool exists;
private bool cursorVisible = true;
@ -573,20 +574,7 @@ namespace OpenTK.Platform.MacOS
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);
}
CloseWindow();
}
}
@ -613,15 +601,37 @@ namespace OpenTK.Platform.MacOS
get { return icon; }
set
{
icon = value;
using (Image img = icon.ToBitmap())
if (value != null && value != icon)
{
// Create and set new icon
IntPtr nsimg = IntPtr.Zero;
using (Image img = value.ToBitmap())
{
nsimg = Cocoa.ToNSImage(img);
if (nsimg != IntPtr.Zero)
{
IntPtr nsimg = Cocoa.ToNSImage(img);
Cocoa.SendVoid(NSApplication.Handle, selSetApplicationIconImage, nsimg);
}
else
{
Debug.Print("[Mac] Failed to create NSImage for {0}", value);
return;
}
}
// Release previous icon
if (current_icon_handle != IntPtr.Zero)
{
Cocoa.SendVoid(current_icon_handle, Selector.Release);
}
// Raise IconChanged event
current_icon_handle = nsimg;
icon = value;
OnIconChanged(EventArgs.Empty);
}
}
}
public override string Title
{
@ -888,7 +898,6 @@ namespace OpenTK.Platform.MacOS
// premultiply alpha, even though that "generally has negligible
// effect on output quality."
IntPtr imgdata =
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(NSBitmapImageRep, Selector.Alloc),
selInitWithBitmapDataPlanes,
@ -902,8 +911,7 @@ namespace OpenTK.Platform.MacOS
NSDeviceRGBColorSpace,
NSBitmapFormat.AlphaFirst,
4 * cursor.Width,
32),
Selector.Autorelease);
32);
if (imgdata == IntPtr.Zero)
{
Debug.Print("Failed to create NSBitmapImageRep with size ({0},{1]})",
@ -934,30 +942,28 @@ namespace OpenTK.Platform.MacOS
// Construct the actual NSImage
IntPtr img =
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(NSImage, Selector.Alloc),
selInitWithSize,
new SizeF(cursor.Width, cursor.Height)),
Selector.Autorelease);
new SizeF(cursor.Width, cursor.Height));
if (img == IntPtr.Zero)
{
Debug.Print("Failed to construct NSImage from NSBitmapImageRep");
Cocoa.SendVoid(imgdata, Selector.Release);
return IntPtr.Zero;
}
Cocoa.SendVoid(img, selAddRepresentation, imgdata);
// Convert the NSImage to a NSCursor
IntPtr nscursor =
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(
Cocoa.SendIntPtr(NSCursor, Selector.Alloc),
selInitWithImageHotSpot,
img,
new PointF(cursor.X, cursor.Y)
),
Selector.Autorelease);
new PointF(cursor.X, cursor.Y));
Cocoa.SendVoid(imgdata, Selector.Release);
Cocoa.SendVoid(img, Selector.Release);
return nscursor;
}
@ -1015,8 +1021,10 @@ namespace OpenTK.Platform.MacOS
NSApplication.Quit -= ApplicationQuit;
CursorVisible = true;
disposed = true;
exists = false;
if (exists)
{
CloseWindow();
}
if (disposing)
{
@ -1027,9 +1035,11 @@ namespace OpenTK.Platform.MacOS
trackingArea = IntPtr.Zero;
}
Debug.Print("[Mac] Disposing {0}", windowInfo);
windowInfo.Dispose();
}
disposed = true;
OnDisposed(EventArgs.Empty);
}
@ -1119,5 +1129,25 @@ namespace OpenTK.Platform.MacOS
{
return (NSWindowStyle)Cocoa.SendUint(windowInfo.Handle, selStyleMask);
}
void CloseWindow()
{
exists = 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);
}
}
}
}