ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-03 01:40:59 +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.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(){
return control.Location.X;
}
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;
}
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

38
Source/GLControl/GLControl.cs
View file

@ -270,27 +270,29 @@ namespace OpenTK
return;
}
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);
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>
/// 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.

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

@ -172,13 +172,6 @@ namespace OpenTK.Platform.MacOS
if (carbonWindow.IsControl == false)
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);
Debug.Print("Setting buffer_rect for control.");