summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editor/code_editor.cpp1
-rw-r--r--scene/gui/button.cpp6
2 files changed, 5 insertions, 2 deletions
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index a1979c7619..50abe8bc36 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -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);
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index d23a4fff43..d8de22d27c 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -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;
}