AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 12:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Force build bot to rebuild.

Browse Source
This commit is contained in:
UnknownShadow200 2015-11-01 14:59:14 +11:00
parent e16c34c90e
commit 84c84c6ab8
4 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenTK/Platform/MacOS/AglContext.cs
View File

@ -143,9 +143,9 @@ namespace OpenTK.Platform.MacOS {
{
CarbonWindowInfo carbonWindow = (CarbonWindowInfo)window;
if (carbonWindow.GoFullScreenHack)
if (carbonWindow.goFullScreenHack)
{
carbonWindow.GoFullScreenHack = false;
carbonWindow.goFullScreenHack = false;
CarbonGLNative wind = GetCarbonWindow(carbonWindow);
if (wind != null)
@ -155,9 +155,9 @@ namespace OpenTK.Platform.MacOS {
return;
}
else if (carbonWindow.GoWindowedHack)
else if (carbonWindow.goWindowedHack)
{
carbonWindow.GoWindowedHack = false;
carbonWindow.goWindowedHack = false;
CarbonGLNative wind = GetCarbonWindow(carbonWindow);
if (wind != null)

3
OpenTK/Platform/MacOS/CarbonBindings/QuartzDisplayServicesAPI.cs
View File

@ -57,5 +57,8 @@ namespace OpenTK.Platform.MacOS.Carbon
[DllImport(appServices)]
internal static extern CGDisplayErr CGDisplayMoveCursorToPoint(IntPtr display, HIPoint point);
[DllImport(appServices)]
internal static extern CGDisplayErr CGAssociateMouseAndMouseCursorPosition(int value);
}
}

5
OpenTK/Platform/MacOS/CarbonGLNative.cs
View File

@ -872,7 +872,7 @@ namespace OpenTK.Platform.MacOS
if (oldState == WindowState.Fullscreen)
{
window.GoWindowedHack = true;
window.goWindowedHack = true;
// when returning from full screen, wait until the context is updated
// to actually do the work.
@ -895,8 +895,7 @@ namespace OpenTK.Platform.MacOS
switch (windowState)
{
case WindowState.Fullscreen:
window.GoFullScreenHack = true;
window.goFullScreenHack = true;
break;
case WindowState.Maximized:

29
OpenTK/Platform/MacOS/CarbonWindowInfo.cs
View File

@ -40,8 +40,8 @@ namespace OpenTK.Platform.MacOS
IntPtr windowRef;
bool ownHandle = false;
bool disposed = false;
bool goFullScreenHack = false;
bool goWindowedHack = false;
internal bool goFullScreenHack = false;
internal bool goWindowedHack = false;
#region Constructors
@ -68,17 +68,6 @@ namespace OpenTK.Platform.MacOS
get { return this.windowRef; }
}
internal bool GoFullScreenHack
{
get { return goFullScreenHack; }
set { goFullScreenHack = value; }
}
internal bool GoWindowedHack
{
get { return goWindowedHack; }
set { goWindowedHack = value; }
}
/// <summary>Returns a System.String that represents the current window.</summary>
/// <returns>A System.String that represents the current window.</returns>
public override string ToString()
@ -95,21 +84,14 @@ namespace OpenTK.Platform.MacOS
#region IDisposable Members
public void Dispose()
{
public void Dispose() {
Dispose(true);
}
void Dispose(bool disposing)
{
void Dispose(bool disposing) {
if (disposed)
return;
if (disposing)
{
}
if (ownHandle)
{
Debug.Print("Disposing window {0}.", windowRef);
@ -120,8 +102,7 @@ namespace OpenTK.Platform.MacOS
disposed = true;
}
~CarbonWindowInfo()
{
~CarbonWindowInfo() {
Dispose(false);
}