Skip to content

W
wine-cw
Commit 5cebefc2 authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard
Browse files
Options

winecfg: Don't convert font height to points when saving system font metrics.

Fix tooltip font size becomes smaller after clicking the apply button in Desktop Integration tab. For example, the original non-client area tooltip font lfHeight is -11. 11 pixels is 8 points in 96 DPI. Setting font size to 8 points to SPI_SETNONCLIENTMETRICS will make SPI_GETNONCLIENTMETRICS report lfHeight as 8. With lfHeight being 8, CreateFontIndirectW() creates a smaller font. This behavior is added by 5b8fdb97. I assume the intention was to save font size in a DPI-independent way. However, when lfHeight is negative, lfHeight will still be scaled back to 96 DPI before saving it to registry and scaled to system DPI when it's read from registry. So I think converting to points is unnecessary. Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent fe257dde
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
programs/winecfg/theme.c
View file @ 5cebefc2
......@@ -1035,12 +1035,6 @@ static void apply_sysparams(void)
ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf;
ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf;
ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi );
ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi );
ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi );
ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi );
ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi );
SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm,
SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment