Skip to content

[Win32] Enable monitor-specific scaling by default #2868

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
Mar 31, 2025
Merged

[Win32] Enable monitor-specific scaling by default #2868

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
12 changes: 12 additions & 0 deletions bundles/org.eclipse.ui.workbench/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.ui.workbench" version="2">
<resource path="eclipseui/org/eclipse/ui/IWorkbenchPreferenceConstants.java" type="org.eclipse.ui.IWorkbenchPreferenceConstants">
<filter id="388194388">
<message_arguments>
<message_argument value="org.eclipse.ui.IWorkbenchPreferenceConstants"/>
<message_argument value="RESCALING_AT_RUNTIME"/>
<message_argument value="RESCALING_AT_RUNTIME"/>
</message_arguments>
</filter>
</resource>
</component>
5 changes: 2 additions & 3 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IWorkbenchPreferenceConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,11 +722,10 @@ public interface IWorkbenchPreferenceConstants {

/**
* <p>
* <strong>EXPERIMENTAL</strong>. Whether the UI adapts to DPI changes at
* runtime. It only effects Windows.
* Whether the UI adapts to DPI changes at runtime. It only affects Windows.
* </p>
*
* @since 3.134
*/
String RESCALING_AT_RUNTIME = "RESCALING_AT_RUNTIME"; //$NON-NLS-1$
String RESCALING_AT_RUNTIME = "monitorSpecificScaling"; //$NON-NLS-1$
}
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ private static void setRescaleAtRuntimePropertyFromPreference() {
));
} else {
boolean rescaleAtRuntime = ConfigurationScope.INSTANCE.getNode(WorkbenchPlugin.PI_WORKBENCH)
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, false);
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, true);
System.setProperty(SWT_RESCALE_AT_RUNTIME_PROPERTY, Boolean.toString(rescaleAtRuntime));
}
}
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public class WorkbenchMessages extends NLS {

public static String HiDpiSettingsGroupTitle;

public static String RescaleAtRuntimeEnabled;
public static String RescaleAtRuntimeDescription;

public static String RescaleAtRuntimeDisclaimer;
public static String RescaleAtRuntimeEnabled;

public static String RescaleAtRuntimeSettingChangeWarningTitle;

Expand Down
29 changes: 8 additions & 21 deletions ...g.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.util.Util;
Expand All @@ -76,7 +75,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
Expand Down Expand Up @@ -140,7 +138,7 @@ protected Control createContents(Composite parent) {
layout.horizontalSpacing = 10;
comp.setLayout(layout);
createThemeIndependentComposits(comp);
createHiDPISettingsGroup(comp);
createRescaleAtRuntimeCheckButton(comp);
return comp;
}

Expand Down Expand Up @@ -186,7 +184,7 @@ protected Control createContents(Composite parent) {
createHideIconsForViewTabs(comp);
createDependency(showFullTextForViewTabs, hideIconsForViewTabs);

createHiDPISettingsGroup(comp);
createRescaleAtRuntimeCheckButton(comp);

if (currentTheme != null) {
String colorsAndFontsThemeId = getColorAndFontThemeIdByThemeId(currentTheme.getId());
Expand All @@ -200,28 +198,17 @@ protected Control createContents(Composite parent) {
return comp;
}

private void createHiDPISettingsGroup(Composite parent) {
private void createRescaleAtRuntimeCheckButton(Composite parent) {
if (!OS.isWindows()) {
return;
}
createLabel(parent, ""); //$NON-NLS-1$
Group group = new Group(parent, SWT.LEFT);
group.setText(WorkbenchMessages.HiDpiSettingsGroupTitle);

GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
gridData.horizontalSpan = ((GridLayout) parent.getLayout()).numColumns;
group.setLayoutData(gridData);
group.setFont(parent.getFont());
GridLayout layout = new GridLayout(1, false);
group.setLayout(layout);
Label infoLabel = new Label(group, SWT.WRAP);
infoLabel.setText(WorkbenchMessages.RescaleAtRuntimeDisclaimer);
infoLabel.setLayoutData(GridDataFactory.defaultsFor(infoLabel).create());
createLabel(group, ""); //$NON-NLS-1$

boolean initialStateRescaleAtRuntime = ConfigurationScope.INSTANCE.getNode(WorkbenchPlugin.PI_WORKBENCH)
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, false);
rescaleAtRuntime = createCheckButton(group, WorkbenchMessages.RescaleAtRuntimeEnabled, initialStateRescaleAtRuntime);
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, true);
rescaleAtRuntime = createCheckButton(parent, WorkbenchMessages.RescaleAtRuntimeEnabled,
initialStateRescaleAtRuntime);
rescaleAtRuntime.setToolTipText(WorkbenchMessages.RescaleAtRuntimeDescription);
}

private void createThemeIndependentComposits(Composite comp) {
Expand Down Expand Up @@ -377,7 +364,7 @@ public boolean performOk() {
IEclipsePreferences configurationScopeNode = ConfigurationScope.INSTANCE
.getNode(WorkbenchPlugin.PI_WORKBENCH);
boolean initialStateRescaleAtRuntime = configurationScopeNode
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, false);
.getBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME, true);
isRescaleAtRuntimeChanged = initialStateRescaleAtRuntime != rescaleAtRuntime.getSelection();
configurationScopeNode.putBoolean(IWorkbenchPreferenceConstants.RESCALING_AT_RUNTIME,
rescaleAtRuntime.getSelection());
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ ThemeChangeWarningTitle = Theme Changed
RescaleAtRuntimeSettingChangeWarningTitle = DPI Setting Changed
RescaleAtRuntimeSettingChangeWarningText = Restart for the DPI setting changes to take effect
HiDpiSettingsGroupTitle = HiDPI settings
RescaleAtRuntimeEnabled = Monitor-specific UI &scaling
RescaleAtRuntimeDisclaimer = EXPERIMENTAL! Activating this option will dynamically scale all windows according to the monitor they are currently in. It is still in development and therefore considered experimental.
RescaleAtRuntimeDescription = Activating this option will dynamically scale all windows according to the monitor they are currently in
RescaleAtRuntimeEnabled = Use monitor-specific UI &scaling
# --- Workbench -----
WorkbenchPreference_openMode=Open mode
WorkbenchPreference_doubleClick=D&ouble click
Expand Down
Loading