diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-03-11 11:05:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-11 11:05:56 +0100 |
commit | 1e099afc8ac420f5c97b07067e28d6309ed55ae7 (patch) | |
tree | 1732b3c3c296af3fff466ee71f8268b080bd4457 /editor/animation_track_editor.cpp | |
parent | 952b71a42556be32132cfeb11e18c5d775b339d2 (diff) | |
parent | 4a8a6f892f6d4579c624faf2f35a6a9883e9cf44 (diff) |
Merge pull request #59016 from Sauermann/fix-cursorshape-animationtimelineedit
Diffstat (limited to 'editor/animation_track_editor.cpp')
-rw-r--r-- | editor/animation_track_editor.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 11995e8cb4..af25403736 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -1814,13 +1814,6 @@ void AnimationTimelineEdit::gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseMotion> mm = p_event; if (mm.is_valid()) { - if (hsize_rect.has_point(mm->get_position())) { - // Change the cursor to indicate that the track name column's width can be adjusted - set_default_cursor_shape(Control::CURSOR_HSIZE); - } else { - set_default_cursor_shape(Control::CURSOR_ARROW); - } - if (dragging_hsize) { int ofs = mm->get_position().x - dragging_hsize_from; name_limit = dragging_hsize_at + ofs; @@ -1836,6 +1829,15 @@ void AnimationTimelineEdit::gui_input(const Ref<InputEvent> &p_event) { } } +Control::CursorShape AnimationTimelineEdit::get_cursor_shape(const Point2 &p_pos) const { + if (dragging_hsize || hsize_rect.has_point(p_pos)) { + // Indicate that the track name column's width can be adjusted + return Control::CURSOR_HSIZE; + } else { + return get_default_cursor_shape(); + } +} + void AnimationTimelineEdit::_scroll_callback(Vector2 p_scroll_vec, bool p_alt) { // Timeline has no vertical scroll, so we change it to horizontal. p_scroll_vec.x += p_scroll_vec.y; |