Skip to content

Remove zoom parameter from CoordinateSystemMapper#mapMonitorBounds() #2742

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −14
Open

Remove zoom parameter from CoordinateSystemMapper#mapMonitorBounds() #2742

Show file tree
Hide file tree
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
36 changes: 32 additions & 4 deletions ...ipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/CoordinateSystemMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
*******************************************************************************/
package org.eclipse.swt.widgets;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;

import java.util.function.*;
import java.util.stream.*;
Expand All @@ -33,10 +32,11 @@ class CoordinateSystemMapperTests {

private Monitor createMonitor(CoordinateSystemMapper mapper, Rectangle boundsInPixels, int nativeZoom) {
Monitor monitor = new Monitor();
Rectangle bounds = mapper.mapMonitorBounds(boundsInPixels, DPIUtil.getZoomForAutoscaleProperty(nativeZoom));
monitor.zoom = nativeZoom;
Rectangle.WithMonitor boundsInPixelWithMonitor = new Rectangle.WithMonitor(boundsInPixels.x, boundsInPixels.y, boundsInPixels.width, boundsInPixels.height, monitor);
Rectangle bounds = mapper.mapMonitorBounds(boundsInPixelWithMonitor);
monitor.setBounds(bounds);
monitor.setClientArea(bounds);
monitor.zoom = nativeZoom;
return monitor;
}

Expand All @@ -59,6 +59,34 @@ private SingleZoomCoordinateSystemMapper getSingleZoomCoordinateSystemMapper() {
return new SingleZoomCoordinateSystemMapper(null);
}

@Test
void mapMonitorBoundsWithSingleZoomCoordinateMapper() {
CoordinateSystemMapper mapper = getSingleZoomCoordinateSystemMapper();
Monitor monitor100 = new Monitor();
monitor100.zoom = 100;
Monitor monitor200 = new Monitor();
monitor200.zoom = 200;

int oldDeviceZoom = DPIUtil.getDeviceZoom();
try {
Rectangle.WithMonitor rectInPixelsWithMonitorAt100 = new Rectangle.WithMonitor(10, 10, 20, 20, monitor100);
Rectangle.WithMonitor rectInPixelsWithMonitorAt200 = new Rectangle.WithMonitor(10, 10, 20, 20, monitor200);
// Result should not depend on monitor zoom
assertEquals(mapper.mapMonitorBounds(rectInPixelsWithMonitorAt100),
mapper.mapMonitorBounds(rectInPixelsWithMonitorAt200));

DPIUtil.setDeviceZoom(100);
Rectangle mappedRectAtDeviceZoom100 = mapper.mapMonitorBounds(rectInPixelsWithMonitorAt100);
DPIUtil.setDeviceZoom(200);
// Result should depend on device zoom
assertNotEquals(mapper.mapMonitorBounds(rectInPixelsWithMonitorAt100), mappedRectAtDeviceZoom100);
assertEquals(mapper.mapMonitorBounds(rectInPixelsWithMonitorAt100),
mapper.mapMonitorBounds(rectInPixelsWithMonitorAt200));
} finally {
DPIUtil.setDeviceZoom(oldDeviceZoom);
}
}

@ParameterizedTest
@MethodSource("provideCoordinateSystemMappers")
void translatePointInNoMonitorBackAndForthShouldBeTheSame(CoordinateSystemMapper mapper) {
Expand Down
2 changes: 1 addition & 1 deletion ...les/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoordinateSystemMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface CoordinateSystemMapper {

Point map(Control from, Control to, int x, int y);

Rectangle mapMonitorBounds(Rectangle rectangle, int zoom);
Rectangle mapMonitorBounds(Rectangle.WithMonitor rectangle);

Point translateFromDisplayCoordinates(Point point);

Expand Down
12 changes: 6 additions & 6 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2225,16 +2225,10 @@ Monitor getMonitor (long hmonitor) {
OS.GetMonitorInfo (hmonitor, lpmi);
Monitor monitor = new Monitor ();
monitor.handle = hmonitor;
Rectangle boundsInPixels = new Rectangle(lpmi.rcMonitor_left, lpmi.rcMonitor_top, lpmi.rcMonitor_right - lpmi.rcMonitor_left,lpmi.rcMonitor_bottom - lpmi.rcMonitor_top);
Rectangle clientAreaInPixels = new Rectangle(lpmi.rcWork_left, lpmi.rcWork_top, lpmi.rcWork_right - lpmi.rcWork_left, lpmi.rcWork_bottom - lpmi.rcWork_top);
int [] dpiX = new int[1];
int [] dpiY = new int[1];
int result = OS.GetDpiForMonitor (monitor.handle, OS.MDT_EFFECTIVE_DPI, dpiX, dpiY);
result = (result == OS.S_OK) ? DPIUtil.mapDPIToZoom (dpiX[0]) : 100;

int autoscaleZoom = DPIUtil.getZoomForAutoscaleProperty(result);
monitor.setBounds(coordinateSystemMapper.mapMonitorBounds(boundsInPixels, autoscaleZoom));
monitor.setClientArea(coordinateSystemMapper.mapMonitorBounds(clientAreaInPixels, autoscaleZoom));
if (result == 0) {
System.err.println("***WARNING: GetDpiForMonitor: SWT could not get valid monitor scaling factor.");
result = 100;
Expand All @@ -2244,6 +2238,12 @@ Monitor getMonitor (long hmonitor) {
* to scaling issue on OS Win8.1 and above, for more details refer bug 537614.
*/
monitor.zoom = result;
Rectangle.WithMonitor boundsInPixels = new Rectangle.WithMonitor(lpmi.rcMonitor_left, lpmi.rcMonitor_top, lpmi.rcMonitor_right - lpmi.rcMonitor_left,lpmi.rcMonitor_bottom - lpmi.rcMonitor_top, monitor);
Rectangle.WithMonitor clientAreaInPixels = new Rectangle.WithMonitor(lpmi.rcWork_left, lpmi.rcWork_top, lpmi.rcWork_right - lpmi.rcWork_left, lpmi.rcWork_bottom - lpmi.rcWork_top, monitor);

monitor.setBounds(coordinateSystemMapper.mapMonitorBounds(boundsInPixels));
monitor.setClientArea(coordinateSystemMapper.mapMonitorBounds(clientAreaInPixels));

return monitor;
}

Expand Down
4 changes: 3 additions & 1 deletion ...clipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MultiZoomCoordinateSystemMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ public Rectangle map(Control from, Control to, int x, int y, int width, int heig
}

@Override
public Rectangle mapMonitorBounds(Rectangle rect, int zoom) {
public Rectangle mapMonitorBounds(Rectangle.WithMonitor rect) {
Monitor monitor = rect.getMonitor();
int zoom = getApplicableMonitorZoom(monitor);
Rectangle bounds = Win32DPIUtils.pixelToPoint(rect, zoom);
bounds.x = rect.x;
bounds.y = rect.y;
Expand Down
4 changes: 2 additions & 2 deletions ...lipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/SingleZoomCoordinateSystemMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public Rectangle map(Control from, Control to, int x, int y, int width, int heig
}

@Override
public Rectangle mapMonitorBounds(Rectangle rect, int zoom) {
return Win32DPIUtils.pixelToPoint(rect, zoom);
public Rectangle mapMonitorBounds(Rectangle.WithMonitor rect) {
return Win32DPIUtils.pixelToPoint(rect, DPIUtil.getDeviceZoom());
}

@Override
Expand Down
Loading