Merge pull request #81921 from YuriSizov/gui-less-friendliness

Connect `CodeHighlighter` with `TextEdit` without friend-access
This commit is contained in:
Rémi Verschelde 2023-09-20 13:10:00 +02:00
commit 73d7651784
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 7 additions and 3 deletions

View File

@ -6018,6 +6018,10 @@ bool TextEdit::is_drawing_spaces() const {
return draw_spaces;
}
Color TextEdit::get_font_color() const {
return theme_cache.font_color;
}
void TextEdit::_bind_methods() {
/* Internal. */

View File

@ -41,8 +41,6 @@
class TextEdit : public Control {
GDCLASS(TextEdit, Control);
friend class CodeHighlighter;
public:
/* Edit Actions. */
enum EditAction {
@ -1029,6 +1027,8 @@ public:
void set_draw_spaces(bool p_enabled);
bool is_drawing_spaces() const;
Color get_font_color() const;
TextEdit(const String &p_placeholder = String());
};

View File

@ -419,7 +419,7 @@ void CodeHighlighter::_clear_highlighting_cache() {
}
void CodeHighlighter::_update_cache() {
font_color = text_edit->theme_cache.font_color;
font_color = text_edit->get_font_color();
}
void CodeHighlighter::add_keyword_color(const String &p_keyword, const Color &p_color) {