Skip to content

[Win32] Properly convert event coordinates in Tracker #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[Win32] Properly convert event coordinates in Tracker #2799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,11 @@ public void setRectangles (Rectangle [] rectangles) {
if (rectangles == null) error (SWT.ERROR_NULL_ARGUMENT);
Rectangle [] rectanglesInPixels = new Rectangle [rectangles.length];
for (int i = 0; i < rectangles.length; i++) {
rectanglesInPixels [i] = Win32DPIUtils.pointToPixel (rectangles [i], getZoom());
if (parent != null) {
rectanglesInPixels [i] = Win32DPIUtils.pointToPixel (rectangles [i], getZoom());
} else {
rectanglesInPixels [i] = display.translateToDisplayCoordinates(rectangles[i]);
}
}
setRectanglesInPixels (rectanglesInPixels);
}
Expand Down Expand Up @@ -999,7 +1003,8 @@ LRESULT wmKeyDown (long hwnd, long wParam, long lParam) {
rectsToErase [i] = new Rectangle (current.x, current.y, current.width, current.height);
}
Event event = new Event ();
event.setLocation(DPIUtil.pixelToPoint(oldX + xChange, getZoom()), DPIUtil.pixelToPoint(oldY + yChange, getZoom()));
Point newLocationInPoints = display.translateFromDisplayCoordinates(new Point(oldX + xChange, oldY + yChange));
event.setLocation(newLocationInPoints.x, newLocationInPoints.y);
Point cursorPos;
if ((style & SWT.RESIZE) != 0) {
resizeRectangles (xChange, yChange);
Expand Down Expand Up @@ -1119,8 +1124,8 @@ LRESULT wmMouse (int message, long wParam, long lParam) {
rectsToErase [i] = new Rectangle (current.x, current.y, current.width, current.height);
}
Event event = new Event ();
int zoom = getZoom();
event.setLocation(DPIUtil.pixelToPoint(newX, zoom), DPIUtil.pixelToPoint(newY, zoom));
Point newLocationInPoints = display.translateFromDisplayCoordinates(new Point(newX, newY));
event.setLocation(newLocationInPoints.x, newLocationInPoints.y);
if ((style & SWT.RESIZE) != 0) {
if (isMirrored) {
resizeRectangles (oldX - newX, newY - oldY);
Expand Down
Loading