diff options
| author | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-12 20:12:34 -0300 |
|---|---|---|
| committer | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-26 15:49:54 +0100 |
| commit | f387b9b4f4ef3ae6eba5199b4089ef591f2d7ba2 (patch) | |
| tree | e9551e973d3b534c769279bba2ad58c7d991d2bf /scene/gui | |
| parent | 9a5d15a2dcb08aa9f3732a0e8e41f2e81c2be365 (diff) | |
Multiple changes to DisplayServerX11
- Travis: Change x11 to linuxbsd
- SCons: Change x11 plataform to linuxbsd
- Plugins: Remove ; to avoid fallthrough warning
- DisplayServerX11: Implement set_icon
- DisplayServerX11: Fix X11 bug when a window was erased from windows
map, all the changes from that erased windows are sending to the main
window
- DisplayServerX11: Reorder create_window commands
- DisplayServerX11: Change every Size2 to Size2i and Rect2 to Rect2i
where it belongs
+ More X11 fixes which have been integrated directly back into reduz's
original commits while rebasing the branch.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 5bc920b04e..49e89f6c6d 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -5062,7 +5062,7 @@ void TextEdit::_update_caches() { #ifdef TOOLS_ENABLED cache.line_spacing = get_theme_constant("line_spacing") * EDSCALE; #else - cache.line_spacing = get_constant("line_spacing"); + cache.line_spacing = get_theme_constant("line_spacing"); #endif cache.row_height = cache.font->get_height() + cache.line_spacing; cache.tab_icon = get_theme_icon("tab"); |