asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59016 from Sauermann/fix-cursorshape-animationtimelineedit

Browse source
This commit is contained in:
Rémi Verschelde 2022-03-11 11:05:56 +01:00 committed by GitHub
commit 1e099afc8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
editor/animation_track_editor.cpp
View file

@ -1814,13 +1814,6 @@ void AnimationTimelineEdit::gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> mm = p_event; Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) { 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) { if (dragging_hsize) {
int ofs = mm->get_position().x - dragging_hsize_from; int ofs = mm->get_position().x - dragging_hsize_from;
name_limit = dragging_hsize_at + ofs; 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) { void AnimationTimelineEdit::_scroll_callback(Vector2 p_scroll_vec, bool p_alt) {
// Timeline has no vertical scroll, so we change it to horizontal. // Timeline has no vertical scroll, so we change it to horizontal.
p_scroll_vec.x += p_scroll_vec.y; p_scroll_vec.x += p_scroll_vec.y;

2
editor/animation_track_editor.h
View file

@ -121,6 +121,8 @@ public:
void set_hscroll(HScrollBar *p_hscroll); void set_hscroll(HScrollBar *p_hscroll);
virtual CursorShape get_cursor_shape(const Point2 &p_pos) const override;
AnimationTimelineEdit(); AnimationTimelineEdit();
}; };