Skip to content

Refactoring: Transform the field DPIUtil.autoScaleMethodSetting to a constant #2117

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

Merged
merged 1 commit into from
May 8, 2025
Merged

Refactoring: Transform the field DPIUtil.autoScaleMethodSetting to a constant #2117

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
29 changes: 18 additions & 11 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*******************************************************************************/
package org.eclipse.swt.internal;

import java.util.*;
import java.util.function.*;

import org.eclipse.swt.*;
Expand Down Expand Up @@ -42,9 +43,20 @@ public class DPIUtil {
private static int deviceZoom = 100;
private static int nativeDeviceZoom = 100;

private static enum AutoScaleMethod { AUTO, NEAREST, SMOOTH }
private static AutoScaleMethod autoScaleMethodSetting = AutoScaleMethod.AUTO;
private static AutoScaleMethod autoScaleMethod = AutoScaleMethod.NEAREST;
private static enum AutoScaleMethod { AUTO, NEAREST, SMOOTH;

public static Optional<AutoScaleMethod> forString(String s) {
for (AutoScaleMethod v : values()) {
if (v.name().equalsIgnoreCase(s)) {
return Optional.of(v);
}
}
return Optional.empty();
}

}
private static final AutoScaleMethod AUTO_SCALE_METHOD_SETTING;
private static AutoScaleMethod autoScaleMethod;

private static String autoScaleValue;
private static final boolean USE_CAIRO_AUTOSCALE = SWT.getPlatform().equals("gtk");
Expand Down Expand Up @@ -100,13 +112,8 @@ private static enum AutoScaleMethod { AUTO, NEAREST, SMOOTH }
autoScaleValue = System.getProperty (SWT_AUTOSCALE);

String value = System.getProperty (SWT_AUTOSCALE_METHOD);
if (value != null) {
if (AutoScaleMethod.NEAREST.name().equalsIgnoreCase(value)) {
autoScaleMethod = autoScaleMethodSetting = AutoScaleMethod.NEAREST;
} else if (AutoScaleMethod.SMOOTH.name().equalsIgnoreCase(value)) {
autoScaleMethod = autoScaleMethodSetting = AutoScaleMethod.SMOOTH;
}
}
AUTO_SCALE_METHOD_SETTING = AutoScaleMethod.forString(value).orElse(AutoScaleMethod.AUTO);
autoScaleMethod = AUTO_SCALE_METHOD_SETTING != AutoScaleMethod.AUTO ? AUTO_SCALE_METHOD_SETTING : AutoScaleMethod.NEAREST;
}

/**
Expand Down Expand Up @@ -615,7 +622,7 @@ public static void setDeviceZoom (int nativeDeviceZoom) {

// in GTK, preserve the current method when switching to a 100% monitor
boolean preserveScalingMethod = SWT.getPlatform().equals("gtk") && deviceZoom == 100;
if (!preserveScalingMethod && autoScaleMethodSetting == AutoScaleMethod.AUTO) {
if (!preserveScalingMethod && AUTO_SCALE_METHOD_SETTING == AutoScaleMethod.AUTO) {
if (sholdUseSmoothScaling()) {
autoScaleMethod = AutoScaleMethod.SMOOTH;
} else {
Expand Down
Loading