mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
winecfg: Keep metrics in DPI-relative format when saving the theme.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
5f494bfeb4
commit
5b8fdb9731
1 changed files with 29 additions and 22 deletions
|
@ -1011,35 +1011,42 @@ static void read_sysparams(HWND hDlg)
|
|||
|
||||
static void apply_sysparams(void)
|
||||
{
|
||||
NONCLIENTMETRICSW nonclient_metrics;
|
||||
NONCLIENTMETRICSW ncm;
|
||||
int i, cnt = 0;
|
||||
int colors_idx[sizeof(metrics) / sizeof(metrics[0])];
|
||||
COLORREF colors[sizeof(metrics) / sizeof(metrics[0])];
|
||||
HDC hdc;
|
||||
int dpi;
|
||||
|
||||
nonclient_metrics.cbSize = sizeof(nonclient_metrics);
|
||||
SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, 0);
|
||||
hdc = GetDC( 0 );
|
||||
dpi = GetDeviceCaps( hdc, LOGPIXELSY );
|
||||
ReleaseDC( 0, hdc );
|
||||
|
||||
nonclient_metrics.iMenuWidth = nonclient_metrics.iMenuHeight =
|
||||
metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size;
|
||||
nonclient_metrics.iCaptionWidth = nonclient_metrics.iCaptionHeight =
|
||||
metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size;
|
||||
nonclient_metrics.iScrollWidth = nonclient_metrics.iScrollHeight =
|
||||
metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size;
|
||||
ncm.cbSize = sizeof(ncm);
|
||||
SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0);
|
||||
|
||||
memcpy(&(nonclient_metrics.lfMenuFont),
|
||||
&(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf),
|
||||
sizeof(LOGFONTW));
|
||||
memcpy(&(nonclient_metrics.lfCaptionFont),
|
||||
&(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf),
|
||||
sizeof(LOGFONTW));
|
||||
memcpy(&(nonclient_metrics.lfStatusFont),
|
||||
&(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf),
|
||||
sizeof(LOGFONTW));
|
||||
memcpy(&(nonclient_metrics.lfMessageFont),
|
||||
&(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf),
|
||||
sizeof(LOGFONTW));
|
||||
/* convert metrics back to twips */
|
||||
ncm.iMenuWidth = ncm.iMenuHeight =
|
||||
MulDiv( metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size, -1440, dpi );
|
||||
ncm.iCaptionWidth = ncm.iCaptionHeight =
|
||||
MulDiv( metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size, -1440, dpi );
|
||||
ncm.iScrollWidth = ncm.iScrollHeight =
|
||||
MulDiv( metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size, -1440, dpi );
|
||||
ncm.iSmCaptionWidth = MulDiv( ncm.iSmCaptionWidth, -1440, dpi );
|
||||
ncm.iSmCaptionHeight = MulDiv( ncm.iSmCaptionHeight, -1440, dpi );
|
||||
|
||||
SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics,
|
||||
ncm.lfMenuFont = metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf;
|
||||
ncm.lfCaptionFont = metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf;
|
||||
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);
|
||||
|
||||
for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++)
|
||||
|
|
Loading…
Reference in a new issue