ryujinx/GLWidget
1
0
Fork 0
mirror of https://github.com/Ryujinx/GLWidget.git synced 2025-07-01 21:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix context creation on macos when gtk window is a nsview

Browse source
This commit is contained in:
Emmanuel 2020-09-15 11:35:43 +00:00
parent c35e98f984
commit 88af339c0b
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
GLWidget/GLWidget.cs
View file

@ -365,7 +365,14 @@ namespace OpenTK
IWindowInfo InitializeOSX() IWindowInfo InitializeOSX()
{ {
IntPtr windowHandle = gdk_quartz_window_get_nswindow(this.Window.Handle); IntPtr windowHandle = gdk_quartz_window_get_nswindow(this.Window.Handle);
//IntPtr viewHandle = gdk_quartz_window_get_nsview(this.GdkWindow.Handle);
if (windowHandle == IntPtr.Zero)
{
IntPtr viewHandle = gdk_quartz_window_get_nsview(this.Window.Handle);
return Utilities.CreateMacOSWindowInfo(windowHandle, viewHandle);
}
return Utilities.CreateMacOSWindowInfo(windowHandle); return Utilities.CreateMacOSWindowInfo(windowHandle);
} }

6
GLWidget/OpenTK/Platform/MacOS/CocoaWindowInfo.cs
View file

@ -37,6 +37,7 @@ namespace OpenTK.Platform.MacOS
internal sealed class CocoaWindowInfo : IWindowInfo internal sealed class CocoaWindowInfo : IWindowInfo
{ {
private static readonly IntPtr selContentView = Selector.Get("contentView"); private static readonly IntPtr selContentView = Selector.Get("contentView");
private static readonly IntPtr selWindow = Selector.Get("window");
private bool disposed = false; private bool disposed = false;
@ -57,6 +58,11 @@ namespace OpenTK.Platform.MacOS
/// <param name="nsViewRef">A valid NSView reference.</param> /// <param name="nsViewRef">A valid NSView reference.</param>
public CocoaWindowInfo(IntPtr nsWindowRef, IntPtr nsViewRef) public CocoaWindowInfo(IntPtr nsWindowRef, IntPtr nsViewRef)
{ {
if (nsWindowRef == IntPtr.Zero)
{
nsWindowRef = Cocoa.SendIntPtr(nsViewRef, selWindow);
}
this.Handle = nsWindowRef; this.Handle = nsWindowRef;
this.ViewHandle = nsViewRef; this.ViewHandle = nsViewRef;
Cocoa.SendVoid(nsWindowRef, Selector.Retain); Cocoa.SendVoid(nsWindowRef, Selector.Retain);