diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-09 14:18:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 14:18:56 +0200 |
| commit | 73e5f6f6736d9879c8d7d3c0d72f6cd60dd18e3b (patch) | |
| tree | 94d63e4e7787abce97a221291a95273889ce8df6 | |
| parent | c6c0479aeda8d504869f2d614550a85ec3dd8f51 (diff) | |
| parent | c3967c80abd2078f0996761faed256a33cf38d97 (diff) | |
Merge pull request #48539 from KoBeWi/cant_edit_this
Display arrow cursor if text is not editable
| -rw-r--r-- | scene/gui/line_edit.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index eb836b3bf7..bfd739788f 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -557,7 +557,7 @@ void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) { } Control::CursorShape LineEdit::get_cursor_shape(const Point2 &p_pos) const { - if (!text.is_empty() && is_editable() && _is_over_clear_button(p_pos)) { + if ((!text.is_empty() && is_editable() && _is_over_clear_button(p_pos)) || (!is_editable() && (!is_selecting_enabled() || text.is_empty()))) { return CURSOR_ARROW; } return Control::get_cursor_shape(p_pos); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index ded912591f..c924f89709 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4450,7 +4450,7 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const { return CURSOR_POINTING_HAND; } - if ((completion_active && completion_rect.has_point(p_pos))) { + if ((completion_active && completion_rect.has_point(p_pos)) || (is_readonly() && (!is_selecting_enabled() || text.size() == 0))) { return CURSOR_ARROW; } |