Merge pull request #28331 from godotengine/revert-26788-master

Revert "RichTextLabel: Adding the ability to change the default cursor"
This commit is contained in:
Rémi Verschelde 2019-04-23 16:13:56 +02:00 committed by GitHub
commit b0da7b66ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions

View File

@ -901,13 +901,21 @@ void RichTextLabel::_find_click(ItemFrame *p_frame, const Point2i &p_click, Item
Control::CursorShape RichTextLabel::get_cursor_shape(const Point2 &p_pos) const {
if (selection.click)
if (!underline_meta || selection.click)
return CURSOR_ARROW;
if (main->first_invalid_line < main->lines.size())
return CURSOR_ARROW; //invalid
return get_default_cursor_shape();
int line = 0;
Item *item = NULL;
((RichTextLabel *)(this))->_find_click(main, p_pos, &item, &line);
if (item && ((RichTextLabel *)(this))->_find_meta(item, NULL))
return CURSOR_POINTING_HAND;
return CURSOR_ARROW;
}
void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {