Skip to content

Cache all Fonts in ScalingSWTFontRegistry on creation #2237

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
Jun 17, 2025
Merged

Cache all Fonts in ScalingSWTFontRegistry on creation #2237

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
11 changes: 11 additions & 0 deletions ...es/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ public void testScaleFontCorrectlyInAutoScaleSzenario() {
fontComparison.originalFontHeight * scalingFactor, fontComparison.currentFontHeight);
}

@Test
public void testSetFontWithMonitorSpecificScalingEnabled() {
DPIUtil.setMonitorSpecificScaling(true);
Display display = Display.getDefault();
Image colorImage = new Image(display, 10, 10);
GC gc = new GC(colorImage);
gc.setFont(display.getSystemFont());
Font font = gc.getFont();
assertEquals(display.getSystemFont(), font);
}

@Test
public void testDoNotScaleFontCorrectlyInNoAutoScaleSzenario() {
DPIUtil.setMonitorSpecificScaling(false);
Expand Down
21 changes: 11 additions & 10 deletions ...es/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ScalingSWTFontRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ private Font getScaledFont(int zoom) {

private Font createAndCacheFont(int zoom) {
Font newFont = createFont(zoom);
customFontHandlesKeyMap.put(Font.win32_getHandle(newFont), this);
FontData clonedFontData = new FontData(newFont.getFontData()[0]);
fontsKeyMap.put(clonedFontData, this);
fontHandlesKeyMap.put(Font.win32_getHandle(newFont), this);
scaledFonts.put(zoom, newFont);
return newFont;
}
Expand Down Expand Up @@ -108,8 +110,8 @@ protected void dispose() {
}

private ScaledFontContainer systemFontContainer;
private Map<FontData, ScaledFontContainer> customFontsKeyMap = new HashMap<>();
private Map<Long, ScaledFontContainer> customFontHandlesKeyMap = new HashMap<>();
private Map<FontData, ScaledFontContainer> fontsKeyMap = new HashMap<>();
private Map<Long, ScaledFontContainer> fontHandlesKeyMap = new HashMap<>();
private Device device;

ScalingSWTFontRegistry(Device device) {
Expand All @@ -125,27 +127,26 @@ public Font getSystemFont(int zoom) {
@Override
public Font getFont(FontData fontData, int zoom) {
ScaledFontContainer container;
if (customFontsKeyMap.containsKey(fontData)) {
container = customFontsKeyMap.get(fontData);
if (fontsKeyMap.containsKey(fontData)) {
container = fontsKeyMap.get(fontData);
} else {
FontData clonedFontData = new FontData(fontData);
container = new ScaledCustomFontContainer(clonedFontData);
customFontsKeyMap.put(clonedFontData, container);
}
return container.getScaledFont(zoom);
}

@Override
public Font getFont(long fontHandle, int zoom) {
if (customFontHandlesKeyMap.containsKey(fontHandle)) {
return customFontHandlesKeyMap.get(fontHandle).getScaledFont(zoom);
if (fontHandlesKeyMap.containsKey(fontHandle)) {
return fontHandlesKeyMap.get(fontHandle).getScaledFont(zoom);
}
return Font.win32_new(device, fontHandle, zoom);
}

@Override
public void dispose() {
customFontsKeyMap.values().forEach(ScaledFontContainer::dispose);
customFontsKeyMap.clear();
fontsKeyMap.values().forEach(ScaledFontContainer::dispose);
fontsKeyMap.clear();
}
}
Loading