Skip to content
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

Jump to bottom

[3.x] Add deselect() to RichTextLabel #59894

Merged
merged 1 commit into from
Apr 4, 2022
Merged

[3.x] Add deselect() to RichTextLabel #59894

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
6 changes: 6 additions & 0 deletions doc/classes/RichTextLabel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
Clears the tag stack and sets [member bbcode_text] to an empty string.
</description>
</method>
<method name="deselect">
<return type="void" />
<description>
Clears the current selection.
</description>
</method>
<method name="get_content_height" qualifiers="const">
<return type="int" />
<description>
Expand Down
30 changes: 13 additions & 17 deletions scene/gui/rich_text_label.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -1177,9 +1176,7 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
selection.from_char = '\0';
selection.to = nullptr;
selection.to_char = '\0';
selection.active = false;

update();
deselect();
}
}
}
Expand Down Expand Up @@ -1224,14 +1221,11 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
selection.click = item;
selection.click_char = line;
if (_is_click_inside_selection()) {
selection.active = false;
selection.from = nullptr;
selection.from_char = '\0';
selection.to = nullptr;
selection.to_char = '\0';
selection.active = false;

update();
deselect();
}
}
if (selection.enabled && OS::get_singleton()->has_feature("primary_clipboard")) {
Expand Down Expand Up @@ -1367,8 +1361,7 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
if (selection.from_char > selection.to_char) {
swap = true;
} else if (selection.from_char == selection.to_char) {
selection.active = false;
update();
deselect();
return;
}
}
Expand Down Expand Up @@ -2008,9 +2001,8 @@ 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;
Expand Down Expand Up @@ -2538,8 +2530,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 {
Expand All @@ -2550,8 +2541,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();
}
}

Expand Down Expand Up @@ -2670,6 +2660,11 @@ String RichTextLabel::get_selected_text() {
return text;
}

void RichTextLabel::deselect() {
selection.active = false;
update();
}

void RichTextLabel::selection_copy() {
String text = get_selected_text();

Expand Down Expand Up @@ -2820,6 +2815,7 @@ 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("set_meta_underline", "enable"), &RichTextLabel::set_meta_underline);
ClassDB::bind_method(D_METHOD("is_meta_underlined"), &RichTextLabel::is_meta_underlined);
Expand Down
1 change: 1 addition & 0 deletions scene/gui/rich_text_label.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ class RichTextLabel : public Control {
void selection_copy();
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);
Expand Down