maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #52067 from timothyqiu/rtl-cursor

Browse source 
Make `RichTextLabel` honour default cursor shape property
This commit is contained in:
Michael Alexsander 2021-08-24 14:45:55 +00:00 committed by GitHub
parent 8a2730cac3 d12cceadd2
commit 9500950af6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/rich_text_label.cpp
View file

@ -1451,7 +1451,7 @@ void RichTextLabel::_notification(int p_what) {
Control::CursorShape RichTextLabel::get_cursor_shape(const Point2 &p_pos) const { Control::CursorShape RichTextLabel::get_cursor_shape(const Point2 &p_pos) const {
if (!underline_meta) { if (!underline_meta) {
return CURSOR_ARROW; return get_default_cursor_shape();
} }
if (selection.click_item) { if (selection.click_item) {
@ -1459,11 +1459,11 @@ Control::CursorShape RichTextLabel::get_cursor_shape(const Point2 &p_pos) const
} }
if (main->first_invalid_line < main->lines.size()) { if (main->first_invalid_line < main->lines.size()) {
return CURSOR_ARROW; //invalid return get_default_cursor_shape(); //invalid
} }
if (main->first_resized_line < main->lines.size()) { if (main->first_resized_line < main->lines.size()) {
return CURSOR_ARROW; //invalid return get_default_cursor_shape(); //invalid
} }
Item *item = nullptr; Item *item = nullptr;
@ -1474,7 +1474,7 @@ Control::CursorShape RichTextLabel::get_cursor_shape(const Point2 &p_pos) const
return CURSOR_POINTING_HAND; return CURSOR_POINTING_HAND;
} }
return CURSOR_ARROW; return get_default_cursor_shape();
} }
void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) { void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {