From 9e0a902068fd76709e1447932483336acb6ff8c3 Mon Sep 17 00:00:00 2001 From: Shahzaib Ibrahim Date: Mon, 17 Nov 2025 12:39:30 +0100 Subject: [PATCH] Limit autoscale mode for monitor-specific scaling to quarter and exact SWT applications will be limited to use autoscale modes quarter and exact when having monitor-specific scaling enabled. With other, unsupported values the application will not start. To enforce application start with an incompatible autoscale mode, a new "force" value for the swt.autoScale.updateOnRuntime property is introduced. Also the tests testing other autoscale values have been removed. --- .../swt/widgets/ControlWin32Tests.java | 2 +- .../org/eclipse/swt/internal/DPIUtil.java | 28 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java b/bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java index 6ec297c6fe..e2e502a227 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java @@ -111,7 +111,7 @@ public void testCorrectScaleUpUsingDifferentSetBoundsMethod() { } @ParameterizedTest - @CsvSource({ "0.5, 100, true", "1.0, 200, true", "2.0, 200, true", "2.0, quarter, true", "0.5, 100, false", + @CsvSource({ "2.0, quarter, true", "0.5, 100, false", "1.0, 200, false", "2.0, 200, false", "2.0, quarter, false", }) public void testAutoScaleImageData(float scaleFactor, String autoScale, boolean monitorSpecificScaling) { Win32DPIUtils.setMonitorSpecificScaling(monitorSpecificScaling); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java index eb407d39f6..c9edf94472 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java @@ -51,11 +51,15 @@ public static Optional forString(String s) { private static String autoScaleValue; - private static final Set ALLOWED_AUTOSCALE_VALUES_FOR_UPDATE_ON_RUNTIME = Set.of("quarter", "exact", "false"); + private static final Set ALLOWED_AUTOSCALE_VALUES_FOR_UPDATE_ON_RUNTIME = Set.of("quarter", "exact"); + /** - * System property to enable to scale the application on runtime - * when a DPI change is detected. + * System property to enable to scale the application on runtime when a DPI + * change is detected. *
    + *
  • "force": the application is scaled on DPI changes even if an unsupported + * value for swt.autoScale are defined. See allowed values + * {@link #ALLOWED_AUTOSCALE_VALUES_FOR_UPDATE_ON_RUNTIME}.
    • *
  • "true": the application is scaled on DPI changes
    • *
  • "false": the application will remain in its initial scaling
    • *
@@ -140,25 +144,19 @@ static void setAutoScaleValue(String autoScaleValueArg) { * scaling. */ public static boolean isSetupCompatibleToMonitorSpecificScaling() { - if (DPIUtil.getAutoScaleValue() == null) { + if (!"win32".equals(SWT.getPlatform())) { return false; } - - if (ALLOWED_AUTOSCALE_VALUES_FOR_UPDATE_ON_RUNTIME.contains(DPIUtil.getAutoScaleValue().toLowerCase())) { - return true; - } - try { - Integer.parseInt(DPIUtil.getAutoScaleValue()); + if (autoScaleValue == null || "force".equals(System.getProperty(SWT_AUTOSCALE_UPDATE_ON_RUNTIME))) { return true; - } catch (NumberFormatException e) { - // unsupported value, use default } - return false; + String value = autoScaleValue.toLowerCase(Locale.ROOT); + return ALLOWED_AUTOSCALE_VALUES_FOR_UPDATE_ON_RUNTIME.contains(value); } public static boolean isMonitorSpecificScalingActive() { - boolean updateOnRuntimeValue = Boolean.getBoolean (DPIUtil.SWT_AUTOSCALE_UPDATE_ON_RUNTIME); - return updateOnRuntimeValue; + String updateOnRuntimeValue = System.getProperty(SWT_AUTOSCALE_UPDATE_ON_RUNTIME); + return "force".equalsIgnoreCase(updateOnRuntimeValue) || "true".equalsIgnoreCase(updateOnRuntimeValue); } public static int pixelToPoint(int size, int zoom) {