Skip to content

[win32] Use consistent font zoom retrieval #1983

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
Apr 24, 2025
Merged

[win32] Use consistent font zoom retrieval #1983

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
5 changes: 2 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public Font getFont () {
checkWidget();
if (font == null) {
long hFont = defaultFont ();
return Font.win32_new (display, hFont, getZoom());
return Font.win32_new (display, hFont, getNativeZoom());
}
return font;
}
Expand Down Expand Up @@ -478,8 +478,7 @@ public void setFont (Font font) {
if (font != null && font.isDisposed ()) {
error (SWT.ERROR_INVALID_ARGUMENT);
}
Shell shell = parent.getShell();
this.font = font == null ? null : Font.win32_new(font, shell.nativeZoom);
this.font = font == null ? null : Font.win32_new(font, getNativeZoom());
if (hasFocus ()) setIMEFont ();
}

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,7 @@ LRESULT WM_PAINT (long wParam, long lParam) {
Control control = findBackgroundControl ();
if (control == null) control = this;
data.background = control.getBackgroundPixel ();
data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0), nativeZoom);
data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0), getNativeZoom());
data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0);
if ((style & SWT.NO_BACKGROUND) != 0) {
/* This code is intentionally commented because it may be slow to copy bits from the screen */
Expand Down
10 changes: 5 additions & 5 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ int defaultBackground () {
}

long defaultFont() {
return display.getSystemFont(getShell().nativeZoom).handle;
return display.getSystemFont(getNativeZoom()).handle;
}

int defaultForeground () {
Expand Down Expand Up @@ -1315,7 +1315,7 @@ public Font getFont () {
if (font != null) return font;
long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (hFont == 0) hFont = defaultFont ();
return Font.win32_new (display, hFont, getShell().nativeZoom);
return Font.win32_new (display, hFont, getNativeZoom());
}

/**
Expand Down Expand Up @@ -3330,7 +3330,7 @@ public void setCursor (Cursor cursor) {
}

void setDefaultFont () {
long hFont = display.getSystemFont (getShell().nativeZoom).handle;
long hFont = display.getSystemFont (getNativeZoom()).handle;
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
}

Expand Down Expand Up @@ -3432,7 +3432,7 @@ public void setFont (Font font) {
Font newFont = font;
if (newFont != null) {
if (newFont.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
newFont = Font.win32_new(newFont, getShell().nativeZoom);
newFont = Font.win32_new(newFont, getNativeZoom());
}
long hFont = 0;
if (newFont != null) {
Expand Down Expand Up @@ -5869,7 +5869,7 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
if (!(widget instanceof Control control)) {
return;
}
resizeFont(control, control.getShell().nativeZoom);
resizeFont(control, control.getNativeZoom());

Image image = control.backgroundImage;
if (image != null) {
Expand Down
8 changes: 3 additions & 5 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,8 +870,7 @@ public void setFont (Font font){
error (SWT.ERROR_INVALID_ARGUMENT);
}
Font oldFont = this.font;
Shell shell = parent.getShell();
Font newFont = (font == null ? font : Font.win32_new(font, shell.nativeZoom));
Font newFont = (font == null ? font : Font.win32_new(font, getNativeZoom()));
if (oldFont == newFont) return;
this.font = newFont;
if (oldFont != null && oldFont.equals (newFont)) return;
Expand Down Expand Up @@ -936,7 +935,7 @@ public void setFont (int index, Font font) {
}
Font oldFont = cellFont [index];
if (oldFont == font) return;
cellFont [index] = font == null ? font : Font.win32_new(font, nativeZoom);
cellFont [index] = font == null ? font : Font.win32_new(font, getNativeZoom());
if (oldFont != null && oldFont.equals (font)) return;
if (font != null) parent.setCustomDraw (true);
if ((parent.style & SWT.VIRTUAL) != 0) cached = true;
Expand Down Expand Up @@ -1282,10 +1281,9 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
}
Font[] cellFonts = tableItem.cellFont;
if (cellFonts != null) {
Shell shell = tableItem.parent.getShell();
for (int index = 0; index < cellFonts.length; index++) {
Font cellFont = cellFonts[index];
cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, shell.nativeZoom);
cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, tableItem.getNativeZoom());
}
}
}
Expand Down
9 changes: 3 additions & 6 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,8 +1388,7 @@ public void setFont (Font font){
error (SWT.ERROR_INVALID_ARGUMENT);
}
Font oldFont = this.font;
Shell shell = parent.getShell();
Font newFont = (font == null ? font : Font.win32_new(font, shell.nativeZoom));
Font newFont = (font == null ? font : Font.win32_new(font, getNativeZoom()));
if (oldFont == newFont) return;
this.font = newFont;
if (oldFont != null && oldFont.equals (font)) return;
Expand Down Expand Up @@ -1445,8 +1444,7 @@ public void setFont (int index, Font font) {
}
Font oldFont = cellFont [index];
if (oldFont == font) return;
Shell shell = parent.getShell();
cellFont [index] = font == null ? font : Font.win32_new(font, shell.nativeZoom);
cellFont [index] = font == null ? font : Font.win32_new(font, getNativeZoom());
if (oldFont != null && oldFont.equals (font)) return;
if (font != null) parent.customDraw = true;
if ((parent.style & SWT.VIRTUAL) != 0) cached = true;
Expand Down Expand Up @@ -1828,10 +1826,9 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
}
Font[] cellFonts = treeItem.cellFont;
if (cellFonts != null) {
Shell shell = treeItem.parent.getShell();
for (int index = 0; index < cellFonts.length; index++) {
Font cellFont = cellFonts[index];
cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, shell.nativeZoom);
cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, treeItem.getNativeZoom());
}
}
for (TreeItem item : treeItem.getItems()) {
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2690,6 +2690,10 @@ GC createNewGC(long hDC, GCData data) {
return GC.win32_new(hDC, data);
}

int getNativeZoom() {
return nativeZoom;
}

int getZoom() {
return DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
}
Expand Down
Loading