Permalink
Browse files

Merge remote-tracking branch 'sappharad/develop' into develop

  • Loading branch information...
2 parents 172462d + d9a7821 commit 53f67f8bdd8b0e2893ba7094bcd1123677ba4cc2 @thefiddler thefiddler committed Feb 27, 2014
@@ -46,7 +46,24 @@ internal CarbonGLControl(GraphicsMode mode, Control owner)
this.mode = mode;
this.control = owner;
- window_info = Utilities.CreateMacOSCarbonWindowInfo(control.Handle, false, true);
+ window_info = Utilities.CreateMacOSCarbonWindowInfo(control.Handle, false, true, GetXOffset, GetYOffset);
+ }
+
+ private int GetXOffset()
+ {
+ return control.Location.X;
+ }
+
+ private int GetYOffset()
+ {
+ if (control.TopLevelControl != null)
+ {
+ System.Drawing.Point offset = control.PointToScreen (control.Location);
+ System.Drawing.Point windowOffset = control.TopLevelControl.PointToScreen (System.Drawing.Point.Empty);
+ int relativeY = offset.Y - windowOffset.Y; //control.TopLevelControl.Location.Y is not the same as windowOffset.Y for some reason.
+ return control.TopLevelControl.ClientSize.Height - control.Bottom - relativeY;
+ }
+ return control.Location.Y;
}
#region IGLControl Members
@@ -270,13 +270,31 @@ protected override void OnResize(EventArgs e)
return;
}
- if (context != null)
- context.Update(Implementation.WindowInfo);
+ if (Configuration.RunningOnMacOS)
+ {
+ DelayUpdate delay = PerformContextUpdate;
+ BeginInvoke(delay); //Need the native window to resize first otherwise our control will be in the wrong place.
+ }
+ else if (context != null)
+ context.Update (Implementation.WindowInfo);
base.OnResize(e);
}
/// <summary>
+ /// Needed to delay the invoke on OS X. Also needed because OpenTK is .NET 2, otherwise I'd use an inline Action.
+ /// </summary>
+ public delegate void DelayUpdate();
+ /// <summary>
+ /// Execute the delayed context update
+ /// </summary>
+ public void PerformContextUpdate()
+ {
+ if (context != null)
+ context.Update (Implementation.WindowInfo);
+ }
+
+ /// <summary>
/// Raises the ParentChanged event.
/// </summary>
/// <param name="e">A System.EventArgs that contains the event data.</param>
@@ -172,32 +172,20 @@ void SetBufferRect(CarbonWindowInfo carbonWindow)
if (carbonWindow.IsControl == false)
return;
- // Todo: See if there is a way around using WinForms.
- throw new NotImplementedException();
-#if false
- System.Windows.Forms.Control ctrl = Control.FromHandle(carbonWindow.WindowRef);
-
- if (ctrl.TopLevelControl == null)
- return;
-
- Rect rect = API.GetControlBounds(carbonWindow.WindowRef);
- System.Windows.Forms.Form frm = (System.Windows.Forms.Form)ctrl.TopLevelControl;
-
- System.Drawing.Point loc = frm.PointToClient(ctrl.PointToScreen(System.Drawing.Point.Empty));
-
- rect.X = (short)loc.X;
- rect.Y = (short)loc.Y;
+ Rect rect = API.GetControlBounds(carbonWindow.WindowHandle);
Debug.Print("Setting buffer_rect for control.");
Debug.Print("MacOS Coordinate Rect: {0}", rect);
-
- rect.Y = (short)(ctrl.TopLevelControl.ClientSize.Height - rect.Y - rect.Height);
- Debug.Print(" AGL Coordinate Rect: {0}", rect);
-
int[] glrect = new int[4];
-
- glrect[0] = rect.X;
- glrect[1] = rect.Y;
+
+ if (carbonWindow.XOffset != null)
+ glrect[0] = rect.X + carbonWindow.XOffset();
+ else
+ glrect[0] = rect.X;
+ if (carbonWindow.YOffset != null)
+ glrect[1] = rect.Y + carbonWindow.YOffset();
+ else
+ glrect[1] = rect.Y;
glrect[2] = rect.Width;
glrect[3] = rect.Height;
@@ -206,7 +194,6 @@ void SetBufferRect(CarbonWindowInfo carbonWindow)
Agl.aglEnable(Handle.Handle, Agl.ParameterNames.AGL_BUFFER_RECT);
MyAGLReportError("aglEnable");
-#endif
}
void SetDrawable(CarbonWindowInfo carbonWindow)
{
@@ -32,6 +32,13 @@
namespace OpenTK.Platform.MacOS
{
+ /// <summary>
+ /// This delegate represents any method that takes no arguments and returns an int.
+ /// I would have used Func but that requires .NET 4
+ /// </summary>
+ /// <returns>The int value that your method returns</returns>
+ public delegate int GetInt();
+
/// \internal
/// <summary>
/// Describes a Carbon window.
@@ -45,6 +52,9 @@ sealed class CarbonWindowInfo : IWindowInfo
bool goFullScreenHack = false;
bool goWindowedHack = false;
+ GetInt xOffset;
+ GetInt yOffset;
+
#region Constructors
/// <summary>
@@ -60,6 +70,12 @@ public CarbonWindowInfo(IntPtr windowRef, bool ownHandle, bool isControl)
this.isControl = isControl;
}
+ public CarbonWindowInfo(IntPtr windowRef, bool ownHandle, bool isControl, GetInt getX, GetInt getY) : this(windowRef, ownHandle, isControl)
+ {
+ this.xOffset = getX;
+ this.yOffset = getY;
+ }
+
#endregion
#region Public Members
@@ -104,6 +120,16 @@ public override string ToString()
// (e.g. MonoGame)
public IntPtr WindowHandle { get { return Handle; } set { Handle = value; } }
+ public GetInt XOffset
+ {
+ get { return xOffset; }
+ set { xOffset = value; }
+ }
+ public GetInt YOffset
+ {
+ get { return yOffset; }
+ set { yOffset = value; }
+ }
#endregion
#region IDisposable Members
@@ -273,7 +273,22 @@ public static IWindowInfo CreateWindowsWindowInfo(IntPtr windowHandle)
/// <returns>A new IWindowInfo instance.</returns>
public static IWindowInfo CreateMacOSCarbonWindowInfo(IntPtr windowHandle, bool ownHandle, bool isControl)
{
- return new OpenTK.Platform.MacOS.CarbonWindowInfo(windowHandle, false, isControl);
+ return CreateMacOSCarbonWindowInfo(windowHandle, ownHandle, isControl, null, null);
+ }
+
+ /// <summary>
+ /// Creates an IWindowInfo instance for the Mac OS X platform with an X and Y offset for the GL viewport location.
+ /// </summary>
+ /// <param name="windowHandle">The handle of the window.</param>
+ /// <param name="ownHandle">Ignored. This is reserved for future use.</param>
+ /// <param name="isControl">Set to true if windowHandle corresponds to a System.Windows.Forms control.</param>
+ /// <param name="xOffset">The X offset for the GL viewport</param>
+ /// <param name="yOffset">The Y offset for the GL viewport</param>
+ /// <returns>A new IWindowInfo instance.</returns>
+ public static IWindowInfo CreateMacOSCarbonWindowInfo(IntPtr windowHandle, bool ownHandle, bool isControl,
+ OpenTK.Platform.MacOS.GetInt xOffset, OpenTK.Platform.MacOS.GetInt yOffset)
+ {
+ return new OpenTK.Platform.MacOS.CarbonWindowInfo(windowHandle, false, isControl, xOffset, yOffset);
}
#endregion

0 comments on commit 53f67f8

Please sign in to comment.