From 220b7e99bea399e23145e802b84965da7cf0f716 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 25 Jul 2022 22:01:26 +0200 Subject: [PATCH] Ported: [3.x] Add deselect() to RichTextLabel - ConteZero https://github.com/godotengine/godot/commit/5e714051ea2d45047269b565af412f6a47c7e76d --- doc/classes/RichTextLabel.xml | 6 ++++++ scene/gui/rich_text_label.cpp | 28 +++++++++++++++------------- scene/gui/rich_text_label.h | 1 + 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/doc/classes/RichTextLabel.xml b/doc/classes/RichTextLabel.xml index 83c4369ab..7be91ed0c 100644 --- a/doc/classes/RichTextLabel.xml +++ b/doc/classes/RichTextLabel.xml @@ -48,6 +48,12 @@ Clears the tag stack and sets [member bbcode_text] to an empty string. + + + + Clears the current selection. + + diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 45d874b2f..b23335cb2 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1068,8 +1068,7 @@ void RichTextLabel::_notification(int p_what) { } break; case NOTIFICATION_FOCUS_EXIT: { if (deselect_on_focus_loss_enabled) { - selection.active = false; - update(); + deselect(); } } break; case Control::NOTIFICATION_DRAG_END: { @@ -1177,9 +1176,8 @@ void RichTextLabel::_gui_input(Ref p_event) { selection.from_char = '\0'; selection.to = nullptr; selection.to_char = '\0'; - selection.active = false; - update(); + deselect(); } } } @@ -1226,9 +1224,8 @@ void RichTextLabel::_gui_input(Ref p_event) { selection.from_char = '\0'; selection.to = nullptr; selection.to_char = '\0'; - selection.active = false; - update(); + deselect(); } } @@ -1362,7 +1359,7 @@ void RichTextLabel::_gui_input(Ref p_event) { if (selection.from_char > selection.to_char) { swap = true; } else if (selection.from_char == selection.to_char) { - selection.active = false; + deselect(); return; } } @@ -2002,10 +1999,10 @@ void RichTextLabel::clear() { main->lines.clear(); main->lines.resize(1); main->first_invalid_line = 0; - update(); selection.click = nullptr; - selection.active = false; + deselect(); current_idx = 1; + if (scroll_follow) { scroll_following = true; } @@ -2532,8 +2529,7 @@ void RichTextLabel::set_selection_enabled(bool p_enabled) { selection.enabled = p_enabled; if (!p_enabled) { if (selection.active) { - selection.active = false; - update(); + deselect(); } set_focus_mode(FOCUS_NONE); } else { @@ -2544,8 +2540,7 @@ void RichTextLabel::set_selection_enabled(bool p_enabled) { void RichTextLabel::set_deselect_on_focus_loss_enabled(const bool p_enabled) { deselect_on_focus_loss_enabled = p_enabled; if (p_enabled && selection.active && !has_focus()) { - selection.active = false; - update(); + deselect(); } } @@ -2664,6 +2659,11 @@ String RichTextLabel::get_selected_text() { return text; } +void RichTextLabel::deselect() { + selection.active = false; + update(); +} + void RichTextLabel::selection_copy() { String text = get_selected_text(); @@ -2814,6 +2814,8 @@ void RichTextLabel::_bind_methods() { ClassDB::bind_method(D_METHOD("pop"), &RichTextLabel::pop); ClassDB::bind_method(D_METHOD("clear"), &RichTextLabel::clear); + ClassDB::bind_method(D_METHOD("deselect"), &RichTextLabel::deselect); + ClassDB::bind_method(D_METHOD("get_selected_text"), &RichTextLabel::get_selected_text); ClassDB::bind_method(D_METHOD("set_meta_underline", "enable"), &RichTextLabel::set_meta_underline); diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index 2655fb1ec..6e1eab2f9 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -479,6 +479,7 @@ public: void set_deselect_on_focus_loss_enabled(const bool p_enabled); bool is_deselect_on_focus_loss_enabled() const; + void deselect(); Error parse_bbcode(const String &p_bbcode); Error append_bbcode(const String &p_bbcode);