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

[Mac] Fixed PointTo* calculations

Browse source 
On HiDPI displays, the client rectangle is using a pixel-based
coordinate system, while the screen is using a point-based coordinate
system. PointToClient/PointToScreen now correctly accounts for that.
This commit is contained in:
thefiddler 2014-05-06 09:03:13 +02:00
parent cd315a3bd6
commit b1f627893b
1 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
View file

@ -469,7 +469,7 @@ namespace OpenTK.Platform.MacOS
{ {
if (selectedCursor != MouseCursor.Default) if (selectedCursor != MouseCursor.Default)
{ {
SetCursor(MouseCursor.Default); //SetCursor(MouseCursor.Default);
} }
OnMouseLeave(EventArgs.Empty); OnMouseLeave(EventArgs.Empty);
@ -587,14 +587,20 @@ namespace OpenTK.Platform.MacOS
public override System.Drawing.Point PointToClient(System.Drawing.Point point) public override System.Drawing.Point PointToClient(System.Drawing.Point point)
{ {
var r = Cocoa.SendRect(windowInfo.Handle, selConvertRectFromScreen, new RectangleF(point.X, point.Y, 0, 0)); var r =
return new Point((int)r.X, (int)(GetContentViewFrame().Height - GetCurrentScreenFrame().Height - r.Y)); Cocoa.SendRect(windowInfo.ViewHandle, selConvertRectToBacking,
Cocoa.SendRect(windowInfo.Handle, selConvertRectFromScreen,
new RectangleF(point.X, GetCurrentScreenFrame().Height - point.Y, 0, 0)));
return new Point((int)r.X, (int)(Height - r.Y));
} }
public override System.Drawing.Point PointToScreen(System.Drawing.Point point) public override System.Drawing.Point PointToScreen(System.Drawing.Point point)
{ {
var r = Cocoa.SendRect(windowInfo.Handle, selConvertRectToScreen, new RectangleF(point.X, point.Y, 0, 0)); var r =
return new Point((int)r.X, (int)(-GetContentViewFrame().Height + GetCurrentScreenFrame().Height - r.Y)); Cocoa.SendRect(windowInfo.Handle, selConvertRectToScreen,
Cocoa.SendRect(windowInfo.ViewHandle, selConvertRectFromBacking,
new RectangleF(point.X, Height - point.Y, 0, 0)));
return new Point((int)r.X, (int)(GetCurrentScreenFrame().Height - r.Y));
} }
public override System.Drawing.Icon Icon public override System.Drawing.Icon Icon
@ -810,11 +816,21 @@ namespace OpenTK.Platform.MacOS
get get
{ {
var r = Cocoa.SendRect(windowInfo.Handle, selFrame); var r = Cocoa.SendRect(windowInfo.Handle, selFrame);
return new Rectangle((int)r.X, (int)(GetCurrentScreenFrame().Height - r.Y), (int)r.Width, (int)r.Height); return new Rectangle(
(int)r.X,
(int)(GetCurrentScreenFrame().Height - r.Y - r.Height),
(int)r.Width,
(int)r.Height);
} }
set set
{ {
Cocoa.SendVoid(windowInfo.Handle, selSetFrame, new RectangleF(value.X, GetCurrentScreenFrame().Height - value.Y, value.Width, value.Height), true); Cocoa.SendVoid(windowInfo.Handle, selSetFrame,
new RectangleF(
value.X,
GetCurrentScreenFrame().Height - value.Y - value.Height,
value.Width,
value.Height),
true);
} }
} }
@ -1039,23 +1055,25 @@ namespace OpenTK.Platform.MacOS
private void SetCursorVisible(bool visible) private void SetCursorVisible(bool visible)
{ {
Carbon.CG.AssociateMouseAndMouseCursorPosition(visible); // If the mouse is outside the window and we want to hide it,
Cocoa.SendVoid(NSCursor, visible ? selUnhide : selHide); // move it inside the window first.
// Otherwise, if we are making the cursor visible again,
// we place it in the same spot as reported in the current
// MouseState to avoid sudden jumps.
if (!visible && !Bounds.Contains(new Point(MouseState.X, MouseState.Y)))
{
Mouse.SetPosition(
(Bounds.Left + Bounds.Right) / 2,
(Bounds.Top + Bounds.Bottom) / 2);
}
else if (visible)
{
var p = PointToScreen(new Point(MouseState.X, MouseState.Y));
Mouse.SetPosition((int)p.X, (int)p.Y);
} }
private void SetCursor(MouseCursor cursor) Carbon.CG.AssociateMouseAndMouseCursorPosition(visible);
{ Cocoa.SendVoid(NSCursor, visible ? selUnhide : selHide);
if (cursor == MouseCursor.Default)
{
Cocoa.SendVoid(NSCursor, selUnhide);
}
else if (cursor == MouseCursor.Empty)
{
Cocoa.SendVoid(NSCursor, selHide);
}
else
{
}
} }
private void SetMenuVisible(bool visible) private void SetMenuVisible(bool visible)