Skip to content

Ensure font is fetched from registry even when zoom levels match #2337

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

Closed
wants to merge 1 commit into from
Closed

Ensure font is fetched from registry even when zoom levels match #2337

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
11 changes: 8 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public Font(Device device, FontData fd) {
this.zoom = DPIUtil.getNativeDeviceZoom();
this.fontData = new FontData(fd);
this.fontHeight = fd.height;
this.handle = SWTFontProvider.getFontHandle(this, this.zoom);
init();
}

Expand Down Expand Up @@ -153,6 +154,7 @@ public Font(Device device, FontData[] fds) {
FontData fd = fds[0];
this.fontData = new FontData(fd);
this.fontHeight = fd.height;
this.handle = SWTFontProvider.getFontHandle(this, this.zoom);
init();
}

Expand Down Expand Up @@ -186,9 +188,15 @@ public Font(Device device, String name, int height, int style) {
this.zoom = DPIUtil.getNativeDeviceZoom();
this.fontData = new FontData (name, height, style);
this.fontHeight = height;
this.handle = SWTFontProvider.getFontHandle(this, this.zoom);
init();
}

@Override
void init() {
super.init();
}

@Override
void destroy() {
OS.DeleteObject(handle);
Expand Down Expand Up @@ -402,9 +410,6 @@ public static Font win32_new(Device device, FontData fontData, int zoom) {
* @since 3.126
*/
public static Font win32_new(Font font, int targetZoom) {
if (targetZoom == font.zoom) {
return font;
}
return SWTFontProvider.getFont(font.getDevice(), font.getFontData()[0], targetZoom);
}
}
Loading