Skip to content

Connect CodeHighlighter with TextEdit without friend-access #81921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akien-mga merged 1 commit into from
Sep 20, 2023
Merged

Connect CodeHighlighter with TextEdit without friend-access #81921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scene/gui/text_edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down
4 changes: 2 additions & 2 deletions scene/gui/text_edit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
class TextEdit : public Control {
GDCLASS(TextEdit, Control);

friend class CodeHighlighter;

public:
/* Edit Actions. */
enum EditAction {
Expand Down Expand Up @@ -1029,6 +1027,8 @@ class TextEdit : public Control {
void set_draw_spaces(bool p_enabled);
bool is_drawing_spaces() const;

Color get_font_color() const;

TextEdit(const String &p_placeholder = String());
};

Expand Down
2 changes: 1 addition & 1 deletion scene/resources/syntax_highlighter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down