Fall back to Sans if no font setting found

Sigh...
This commit is contained in:
oldmud0 2019-07-27 21:19:45 -05:00 committed by GitHub
parent c09fdc49a7
commit 56ddd024eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -226,14 +226,16 @@ pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QStrin
}
QString AOApplication::get_font_name(QString p_identifier, QString p_file)
{
QString design_ini_path = get_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
QString default_path = get_default_theme_path(p_file);
if(f_result == "")
{
f_result = read_design_ini(p_identifier, default_path);
}
return f_result;
QString design_ini_path = get_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
QString default_path = get_default_theme_path(p_file);
if (f_result == "")
{
f_result = read_design_ini(p_identifier, default_path);
if (f_result == "")
return "Sans";
}
return f_result;
}
int AOApplication::get_font_size(QString p_identifier, QString p_file)
{