ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-01 15:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update spacing and formatting to match existing style

Browse source
This commit is contained in:
Paul Kratt 2014-02-22 11:28:14 -06:00
parent ba0180ed77
commit 0df7c55609
3 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Source/GLControl/CarbonGLControl.cs
View file

@ -46,22 +46,25 @@ namespace OpenTK
this.mode = mode; this.mode = mode;
this.control = owner; this.control = owner;
window_info = Utilities.CreateMacOSCarbonWindowInfo(control.Handle, false, true, GetXOffset, GetYOffset); window_info = Utilities.CreateMacOSCarbonWindowInfo(control.Handle, false, true, GetXOffset, GetYOffset);
} }
private int GetXOffset(){ private int GetXOffset()
return control.Location.X; {
} return control.Location.X;
}
private int GetYOffset(){ private int GetYOffset()
if (control.TopLevelControl != null) { {
System.Drawing.Point offset = control.PointToScreen (control.Location); if (control.TopLevelControl != null)
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. System.Drawing.Point offset = control.PointToScreen (control.Location);
return control.TopLevelControl.ClientSize.Height - control.Bottom - relativeY; 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.Location.Y; return control.TopLevelControl.ClientSize.Height - control.Bottom - relativeY;
} }
return control.Location.Y;
}
#region IGLControl Members #region IGLControl Members

38
Source/GLControl/GLControl.cs
View file

@ -270,27 +270,29 @@ namespace OpenTK
return; return;
} }
if (Configuration.RunningOnMacOS) { if (Configuration.RunningOnMacOS)
DelayUpdate delay = PerformContextUpdate; {
BeginInvoke(delay); //Need the native window to resize first otherwise our control will be in the wrong place. 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); else if (context != null)
context.Update (Implementation.WindowInfo);
base.OnResize(e); base.OnResize(e);
} }
/// <summary> /// <summary>
/// Needed to delay the invoke on OS X. Also needed because OpenTK is .NET 2, otherwise I'd use an inline Action. /// Needed to delay the invoke on OS X. Also needed because OpenTK is .NET 2, otherwise I'd use an inline Action.
/// </summary> /// </summary>
public delegate void DelayUpdate(); public delegate void DelayUpdate();
/// <summary> /// <summary>
/// Execute the delayed context update /// Execute the delayed context update
/// </summary> /// </summary>
public void PerformContextUpdate(){ public void PerformContextUpdate()
if (context != null) {
context.Update (Implementation.WindowInfo); if (context != null)
} context.Update (Implementation.WindowInfo);
}
/// <summary> /// <summary>
/// Raises the ParentChanged event. /// Raises the ParentChanged event.

7
Source/OpenTK/Platform/MacOS/AglContext.cs
View file

@ -172,13 +172,6 @@ namespace OpenTK.Platform.MacOS
if (carbonWindow.IsControl == false) if (carbonWindow.IsControl == false)
return; return;
// Todo: See if there is a way around using WinForms.
//throw new NotImplementedException();
/*System.Windows.Forms.Control ctrl = Control.FromHandle(carbonWindow.WindowHandle);
if (ctrl.TopLevelControl == null)
return;*/
Rect rect = API.GetControlBounds(carbonWindow.WindowHandle); Rect rect = API.GetControlBounds(carbonWindow.WindowHandle);
Debug.Print("Setting buffer_rect for control."); Debug.Print("Setting buffer_rect for control.");