mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up merge conflict.

Browse Source
This commit is contained in:
casey langen 2023-01-02 16:06:24 -08:00
parent 689aae4c5f
commit 0e4f4e595f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/3rdparty/win32_src/pdcurses/wingui/pdcdisp.c vendored
View File

@ -270,24 +270,18 @@ static int PDC_fontface_exists( const TCHAR* fontface)
static LOGFONT PDC_get_logical_font( const int font_idx) static LOGFONT PDC_get_logical_font( const int font_idx)
{ {
if ( PDC_font_size < 0)
{
PDC_font_size = scale_font_for_current_dpi( 15); /* default 15 points */
}
/* see if the user has overridden the default fontface. */ /* see if the user has overridden the default fontface. */
if ( wcslen( PDC_font_name) == 0 && PDC_fontface_exists(PDC_preferred_fontface)) if ( wcslen( PDC_font_name) == 0 && PDC_fontface_exists(PDC_preferred_fontface))
{ {
wcsncpy( PDC_font_name, PDC_preferred_fontface, sizeof(PDC_font_name)); wcsncpy( PDC_font_name, PDC_preferred_fontface, sizeof(PDC_font_name));
} }
LOGFONT lf;
if ( PDC_font_size < 0) if ( PDC_font_size < 0)
{ {
PDC_font_size = scale_font_for_current_dpi( 12); /* default 12 points */ PDC_font_size = scale_font_for_current_dpi( 12); /* default 12 points */
} }
LOGFONT lf;
memset(&lf, 0, sizeof(LOGFONT)); /* Clear out structure. */ memset(&lf, 0, sizeof(LOGFONT)); /* Clear out structure. */
lf.lfHeight = -PDC_font_size; lf.lfHeight = -PDC_font_size;
#ifdef PDC_WIDE #ifdef PDC_WIDE