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

Fixed few bugs related to getting mouse coordinates

Browse source
This commit is contained in:
TD25 2016-02-22 02:27:18 +02:00
parent 3d58a0b50a
commit e5ab1ae791
4 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs
View file

@ -351,27 +351,14 @@ namespace OpenTK.Platform.Linux
public override Point PointToClient(Point point) public override Point PointToClient(Point point)
{ {
var origin = Point.Empty;
var display = DisplayDevice.Default;
if (display != null)
{
origin = display.Bounds.Location;
}
var client = Location; var client = Location;
return new Point(point.X + client.X - origin.X, point.Y + client.Y - origin.Y); return new Point(point.X - client.X, point.Y - client.Y);
} }
public override Point PointToScreen(Point point) public override Point PointToScreen(Point point)
{ {
var origin = Point.Empty;
var display = DisplayDevice.Default;
if (display != null)
{
origin = display.Bounds.Location;
}
var client = Location; var client = Location;
return new Point(point.X + origin.X - client.X, point.Y + origin.Y - client.Y); return new Point(point.X + client.X, point.Y + client.Y);
} }
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)

4
Source/OpenTK/Platform/SDL2/Sdl2.cs
View file

@ -248,6 +248,10 @@ namespace OpenTK.Platform.SDL2
[DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetMouseState", ExactSpelling = true)] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetMouseState", ExactSpelling = true)]
public static extern ButtonFlags GetMouseState(out int hx, out int hy); public static extern ButtonFlags GetMouseState(out int hx, out int hy);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetGlobalMouseState", ExactSpelling = true)]
public static extern ButtonFlags GetGlobalMouseState(out int hx, out int hy);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetNumDisplayModes", ExactSpelling = true)] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetNumDisplayModes", ExactSpelling = true)]
public static extern int GetNumDisplayModes(int displayIndex); public static extern int GetNumDisplayModes(int displayIndex);

6
Source/OpenTK/Platform/SDL2/Sdl2Mouse.cs
View file

@ -124,7 +124,7 @@ namespace OpenTK.Platform.SDL2
public MouseState GetCursorState() public MouseState GetCursorState()
{ {
int x, y; int x, y;
var buttons = SDL.GetMouseState(out x, out y); var buttons = SDL.GetGlobalMouseState(out x, out y);
var c = new MouseState(); var c = new MouseState();
c.SetIsConnected(true); c.SetIsConnected(true);
@ -137,7 +137,7 @@ namespace OpenTK.Platform.SDL2
c[MouseButton.Button1] = (buttons & ButtonFlags.X1) != 0; c[MouseButton.Button1] = (buttons & ButtonFlags.X1) != 0;
c[MouseButton.Button2] = (buttons & ButtonFlags.X2) != 0; c[MouseButton.Button2] = (buttons & ButtonFlags.X2) != 0;
return state; return c;
} }
public void SetPosition(double x, double y) public void SetPosition(double x, double y)
@ -145,7 +145,7 @@ namespace OpenTK.Platform.SDL2
SDL.WarpMouseInWindow(IntPtr.Zero, (int)x, (int)y); SDL.WarpMouseInWindow(IntPtr.Zero, (int)x, (int)y);
} }
#endregion #endregion
} }
} }

16
Source/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
View file

@ -577,26 +577,14 @@ namespace OpenTK.Platform.SDL2
public override Point PointToClient(Point point) public override Point PointToClient(Point point)
{ {
var origin = Point.Empty;
var display = DisplayDevice.Default;
if (display != null)
{
origin = display.Bounds.Location;
}
var client = Location; var client = Location;
return new Point(point.X + client.X - origin.X, point.Y + client.Y - origin.Y); return new Point(point.X - client.X, point.Y - client.Y);
} }
public override Point PointToScreen(Point point) public override Point PointToScreen(Point point)
{ {
var origin = Point.Empty;
var display = DisplayDevice.Default;
if (display != null)
{
origin = display.Bounds.Location;
}
var client = Location; var client = Location;
return new Point(point.X + origin.X - client.X, point.Y + origin.Y - client.Y); return new Point(point.X + client.X, point.Y + client.Y);
} }
public override Icon Icon public override Icon Icon