Skip to content
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.

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

[Win] Disallow autoscale mode "integer" for monitor-specific scaling #1721

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -650,11 +650,49 @@ public static int getZoomForAutoscaleProperty (int nativeDeviceZoom) {
return zoom;
}

public static boolean isAutoScaleOnRuntimeActive() {
public static boolean isMonitorSpecificScalingActive() {
boolean updateOnRuntimeValue = Boolean.getBoolean (SWT_AUTOSCALE_UPDATE_ON_RUNTIME);
return updateOnRuntimeValue;
}

public static void setAutoScaleForMonitorSpecificScaling() {
boolean isDefaultAutoScale = autoScaleValue == null;
if (isDefaultAutoScale) {
autoScaleValue = "quarter";
} else if (!isSupportedAutoScaleForMonitorSpecificScaling()) {
throw new SWTError(SWT.ERROR_NOT_IMPLEMENTED,
"monitor-specific scaling is only implemented for auto-scale values \"quarter\", \"exact\", \"false\" or a concrete zoom value, but \""
+ autoScaleValue + "\" has been specified");
}
}

/**
* Monitor-specific scaling on Windows only supports auto-scale modes in which
* all elements (font, images, control bounds etc.) are scaled equally or almost
* equally. The previously default mode "integer"/"integer200", which rounded
* the scale factor for everything but fonts to multiples of 100, is complex and
* difficult to realize with monitor-specific rescaling of UI elements. Since a
* uniform scale factor for everything should perspectively be used anyway,
* there will be support for complex auto-scale modes for monitor-specific
* scaling.
*
* The supported modes are "quarter" and "exact" or explicit zoom values given
* by the value itself or "false". Every other value will be treated as
* "integer"/"integer200" and is thus not supported.
*/
private static boolean isSupportedAutoScaleForMonitorSpecificScaling() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just thought about: should we have a comment here, why only those values are supported?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's a good idea. I added some documentation about why only those values are supported. @akoch-yatta can you have a look whether you think the description is okay?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think is explanation is good

switch (autoScaleValue) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other parts of the class work with equalsIgnoreCase() to support case-sensitive values like False etc. This switch should do that too.

I though about using: switch(autoScaleValue.toLowerCase()) but I'm not sure about the default locale so a more explicit if-else construction would be fine for me too.

case "false", "quarter", "exact": return true;
}
try {
Integer.parseInt(autoScaleValue);
return true;
} catch (NumberFormatException e) {
// unsupported value, use default
}
return false;
}

/**
* AutoScale ImageDataProvider.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -948,8 +948,9 @@ public void close () {
protected void create (DeviceData data) {
checkSubclass ();
checkDisplay (thread = Thread.currentThread (), true);
if (DPIUtil.isAutoScaleOnRuntimeActive()) {
if (DPIUtil.isMonitorSpecificScalingActive()) {
setRescalingAtRuntime(true);
DPIUtil.setAutoScaleForMonitorSpecificScaling();
}
createDisplay (data);
register (this);
Expand Down
Loading