wineconsole: Set the correct font height even when no registry data is present.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-10-18 21:42:52 +02:00
parent c970b263c0
commit b4516a2f1f
2 changed files with 2 additions and 1 deletions

View File

@ -211,7 +211,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg)
cfg->cursor_visible = 1; cfg->cursor_visible = 1;
cfg->exit_on_die = 1; cfg->exit_on_die = 1;
memset(cfg->face_name, 0, sizeof(cfg->face_name)); memset(cfg->face_name, 0, sizeof(cfg->face_name));
cfg->cell_height = MulDiv( 12, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); cfg->cell_height = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI );
cfg->cell_width = MulDiv( 8, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); cfg->cell_width = MulDiv( 8, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI );
cfg->font_weight = FW_NORMAL; cfg->font_weight = FW_NORMAL;
cfg->history_size = 50; cfg->history_size = 50;

View File

@ -403,6 +403,7 @@ static int CALLBACK get_first_font_enum_2(const LOGFONTW* lf, const TEXTMETRICW*
*/ */
mlf.lfWidth = fc->data->curcfg.cell_width; mlf.lfWidth = fc->data->curcfg.cell_width;
mlf.lfHeight = fc->data->curcfg.cell_height; mlf.lfHeight = fc->data->curcfg.cell_height;
if (!mlf.lfHeight) mlf.lfHeight = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI );
if (WCUSER_SetFont(fc->data, &mlf)) if (WCUSER_SetFont(fc->data, &mlf))
{ {
struct config_data defcfg; struct config_data defcfg;