TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoadisplay: Remove overzealous coordinates transform performed on mouse position

Browse Source
This commit is contained in:
LD 2022-05-30 21:52:51 +02:00 committed by rdb
parent 105f9abbfa
commit 69bf5fa626
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -139,10 +139,10 @@ move_pointer(int device, int x, int y) {
if (device == 0) { if (device == 0) {
CGPoint point; CGPoint point;
if (_properties.get_fullscreen()) { if (_properties.get_fullscreen()) {
point = CGPointMake(x, y + 1); point = CGPointMake(x, y);
} else { } else {
point = CGPointMake(x + _properties.get_x_origin(), point = CGPointMake(x + _properties.get_x_origin(),
y + _properties.get_y_origin() + 1); y + _properties.get_y_origin());
} }
// I don't know what the difference between these two methods is. if // I don't know what the difference between these two methods is. if
@ -1966,9 +1966,8 @@ handle_mouse_moved_event(bool in_window, double x, double y, bool absolute) {
} }
} }
// Strangely enough, in Cocoa, mouse Y coordinates are 1-based.
nx = x; nx = x;
ny = y - 1; ny = y;
} else { } else {
// We received deltas, so add it to the current mouse position. // We received deltas, so add it to the current mouse position.
@ -1985,10 +1984,10 @@ handle_mouse_moved_event(bool in_window, double x, double y, bool absolute) {
ny = std::max(0., std::min((double) get_y_size() - 1, ny)); ny = std::max(0., std::min((double) get_y_size() - 1, ny));
if (_properties.get_fullscreen()) { if (_properties.get_fullscreen()) {
point = CGPointMake(nx, ny + 1); point = CGPointMake(nx, ny);
} else { } else {
point = CGPointMake(nx + _properties.get_x_origin(), point = CGPointMake(nx + _properties.get_x_origin(),
ny + _properties.get_y_origin() + 1); ny + _properties.get_y_origin());
} }
if (CGWarpMouseCursorPosition(point) == kCGErrorSuccess) { if (CGWarpMouseCursorPosition(point) == kCGErrorSuccess) {