Skip to content

[Win32] Properly handle setting null font to GC #2350 #2351

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

[Win32] Properly handle setting null font to GC #2350 #2351

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
3 changes: 1 addition & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5015,8 +5015,7 @@ private class SetFontOperation extends Operation {
private final Font font;

SetFontOperation(Font font) {
this.font = new Font(font.getDevice(), font.getFontData());
registerForDisposal(this.font);
this.font = font != null ? SWTFontProvider.getFont(font.getDevice(), font.getFontData()[0], data.nativeZoom) : null;
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions ...e.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,9 @@ public void test_setClippingLorg_eclipse_swt_graphics_Rectangle() {

@Test
public void test_setFontLorg_eclipse_swt_graphics_Font() {
gc.setFont(null);
assertEquals(shell.getDisplay().getSystemFont(), gc.getFont());

gc.setFont(shell.getDisplay().getSystemFont());
Font font = gc.getFont();
assertEquals(shell.getDisplay().getSystemFont(), font);
Expand Down
Loading