seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15186 from GodotExplorer/default-theme

Browse Source 
Fix errors with custom theme and custom font in project settings.
This commit is contained in:
Rémi Verschelde
2018-01-04 14:50:15 +01:00
committed by GitHub
parent da4edf83d3 bd0a9f4bd6
commit dc2cc6bc2b
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/resources/default_theme/default_theme.cpp
View File

@ -880,7 +880,7 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
Ref<StyleBox> default_style;
Ref<Texture> default_icon;
Ref<BitmapFont> default_font;
Ref<Font> default_font;
if (p_font.is_valid()) {
default_font = p_font;
} else if (p_hidpi) {
@ -888,7 +888,7 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
} else {
default_font = make_font2(_lodpi_font_height, _lodpi_font_ascent, _lodpi_font_charcount, &_lodpi_font_charrects[0][0], _lodpi_font_kerning_pair_count, &_lodpi_font_kerning_pairs[0][0], _lodpi_font_img_width, _lodpi_font_img_height, _lodpi_font_img_data);
}
Ref<BitmapFont> large_font = default_font;
Ref<Font> large_font = default_font;
fill_default_theme(t, default_font, large_font, default_icon, default_style, p_hidpi ? 2.0 : 1.0);
Theme::set_default(t);