ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 23:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented PointToScreen and fixed mouse grab rectangle to match the client rectangle exactly.

Browse source
This commit is contained in:
the_fiddler 2010-10-22 13:22:28 +00:00
parent 3d87bc7e8f
commit 327941be33
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Source/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -856,7 +856,7 @@ namespace OpenTK.Platform.Windows
while (cursor_visible_count < 0); while (cursor_visible_count < 0);
if (!Functions.ClipCursor(IntPtr.Zero)) if (!Functions.ClipCursor(IntPtr.Zero))
Debug.WriteLine(String.Format("Failed to grab cursor. Error: {0}", Debug.WriteLine(String.Format("Failed to ungrab cursor. Error: {0}",
Marshal.GetLastWin32Error())); Marshal.GetLastWin32Error()));
} }
else if (!value && cursor_visible_count >= 0) else if (!value && cursor_visible_count >= 0)
@ -867,7 +867,10 @@ namespace OpenTK.Platform.Windows
} }
while (cursor_visible_count >= 0); while (cursor_visible_count >= 0);
Win32Rectangle rect = Win32Rectangle.From(Bounds); Win32Rectangle rect = Win32Rectangle.From(ClientRectangle);
Point pos = PointToScreen(new Point(rect.left, rect.top));
rect.left = pos.X;
rect.top = pos.Y;
if (!Functions.ClipCursor(ref rect)) if (!Functions.ClipCursor(ref rect))
Debug.WriteLine(String.Format("Failed to grab cursor. Error: {0}", Debug.WriteLine(String.Format("Failed to grab cursor. Error: {0}",
Marshal.GetLastWin32Error())); Marshal.GetLastWin32Error()));
@ -1064,7 +1067,7 @@ namespace OpenTK.Platform.Windows
{ {
if (!Functions.ScreenToClient(window.WindowHandle, ref point)) if (!Functions.ScreenToClient(window.WindowHandle, ref point))
throw new InvalidOperationException(String.Format( throw new InvalidOperationException(String.Format(
"Could not convert point {0} from client to screen coordinates. Windows error: {1}", "Could not convert point {0} from screen to client coordinates. Windows error: {1}",
point.ToString(), Marshal.GetLastWin32Error())); point.ToString(), Marshal.GetLastWin32Error()));
return point; return point;
@ -1074,9 +1077,14 @@ namespace OpenTK.Platform.Windows
#region PointToScreen #region PointToScreen
public Point PointToScreen(Point p) public Point PointToScreen(Point point)
{ {
throw new NotImplementedException(); if (!Functions.ClientToScreen(window.WindowHandle, ref point))
throw new InvalidOperationException(String.Format(
"Could not convert point {0} from screen to client coordinates. Windows error: {1}",
point.ToString(), Marshal.GetLastWin32Error()));
return point;
} }
#endregion #endregion