Skip to content

[Win32] Use exact selected font size from FontDialog #2435

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
Sep 8, 2025
Merged

[Win32] Use exact selected font size from FontDialog #2435

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
31 changes: 1 addition & 30 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,36 +249,7 @@ public FontData open () {
if (success) {
LOGFONT logFont = new LOGFONT();
OS.MoveMemory(logFont, lpLogFont, LOGFONT.sizeof);

/*
* This will not work on multiple screens or for printing. Should use DC for the
* proper device.
*/
int logPixelsY = getDPI();
int pixels = 0;
long hDC = OS.GetDC(0);
if (logFont.lfHeight > 0) {
/*
* Feature in Windows. If the lfHeight of the LOGFONT structure is positive, the
* lfHeight measures the height of the entire cell, including internal leading,
* in logical units. Since the height of a font in points does not include the
* internal leading, we must subtract the internal leading, which requires a
* TEXTMETRIC, which in turn requires font creation.
*/
long hFont = OS.CreateFontIndirect(logFont);
long oldFont = OS.SelectObject(hDC, hFont);
TEXTMETRIC lptm = new TEXTMETRIC();
OS.GetTextMetrics(hDC, lptm);
OS.SelectObject(hDC, oldFont);
OS.DeleteObject(hFont);
pixels = logFont.lfHeight - lptm.tmInternalLeading;
} else {
pixels = -logFont.lfHeight;
}
OS.ReleaseDC(0, hDC);

float points = pixels * 72f / logPixelsY;
fontData = FontData.win32_new(logFont, points);
fontData = FontData.win32_new(logFont, lpcf.iPointSize / 10f);
if (effectsVisible) {
int red = lpcf.rgbColors & 0xFF;
int green = (lpcf.rgbColors >> 8) & 0xFF;
Expand Down
Loading