mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-18 20:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix regressions from Font refactor

Browse Source 
Remove unnecessary font override
Fixes button outline draw when it should not, causing button colors to be slightly off
This commit is contained in:
bruvzg 2022-07-08 08:27:18 +03:00
parent 5268efdcd9
commit 8f6c4956ca
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/code_editor.cpp
View File

@ -1895,7 +1895,6 @@ CodeTextEditor::CodeTextEditor() {
} break;
}
}
text_editor->add_theme_font_override("font", fc);
text_editor->set_draw_line_numbers(true);
text_editor->set_highlight_matching_braces_enabled(true);

6
scene/gui/button.cpp
View File

@ -342,7 +342,11 @@ void Button::_notification(int p_what) {
} break;
}
text_buf->draw_outline(ci, text_ofs, get_theme_constant(SNAME("outline_size")), get_theme_color(SNAME("font_outline_color")));
Color font_outline_color = get_theme_color(SNAME("font_outline_color"));
int outline_size = get_theme_constant(SNAME("outline_size"));
if (outline_size > 0 && font_outline_color.a > 0) {
text_buf->draw_outline(ci, text_ofs, outline_size, font_outline_color);
}
text_buf->draw(ci, text_ofs, color);
} break;
}