Skip to content

Check also device native zoom in Test_org_eclipse_swt_widgets_Shell #3598

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

Closed
trancexpress wants to merge 1 commit into from
Closed

Check also device native zoom in Test_org_eclipse_swt_widgets_Shell #3598

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
8 changes: 5 additions & 3 deletions ...swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.graphics.Region;
import org.eclipse.swt.internal.DPIUtil;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
Expand Down Expand Up @@ -766,14 +767,14 @@ public void test_setSizeII() {
Point newSize = new Point(112, 27);
for (int i = 0; i < 10; i++) {
testShell.setSize(newSize.x, newSize.y);
assertEquals(newSize, testShell.getSize());
assertShellProperlySized(testShell, newSize);
newSize.x += 100;
newSize.y += 100;
}
newSize = new Point(1292, 1036);
for (int i = 0; i < 10; i++) {
testShell.setSize(newSize.x, newSize.y);
assertEquals(newSize, testShell.getSize());
assertShellProperlySized(testShell, newSize);
newSize.x -= 100;
newSize.y -= 100;
}
Expand Down Expand Up @@ -821,8 +822,9 @@ public void test_setSizeLorg_eclipse_swt_graphics_Point() {
}
}

@SuppressWarnings("restriction")
private void assertShellProperlySized(Shell shell, Point expectedSize) {
int tolerance = shell.getZoom() != 100 ? 1 : 0;
int tolerance = shell.getZoom() != 100 || DPIUtil.getNativeDeviceZoom() != 100 ? 1 : 0;
Point actualSize = shell.getSize();
assertTrue(
Math.abs(expectedSize.x - actualSize.x) <= tolerance
Expand Down
Loading