From 32a1d31bc0a20bf757053c44fced89c0ca08ba1a Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 27 Jul 2022 12:44:50 -0700 Subject: [PATCH] seekablewidget: add hand move events --- app/widget/timeruler/seekablewidget.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index ebea9a18e..8dc21dace 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -175,7 +175,9 @@ void SeekableWidget::mousePressEvent(QMouseEvent *event) { TimelineMarker *initial; - if (resize_item_) { + if (HandPress(event)) { + return; + } else if (resize_item_) { // Handle selection, even though we won't be using it for dragging if (!(event->modifiers() & Qt::ShiftModifier)) { selection_manager_.ClearSelection(); @@ -197,7 +199,9 @@ void SeekableWidget::mousePressEvent(QMouseEvent *event) void SeekableWidget::mouseMoveEvent(QMouseEvent *event) { - if (selection_manager_.IsDragging()) { + if (HandMove(event)) { + return; + } else if (selection_manager_.IsDragging()) { selection_manager_.DragMove(event); } else if (dragging_) { QPointF scene = mapToScene(event->pos()); @@ -218,6 +222,10 @@ void SeekableWidget::mouseMoveEvent(QMouseEvent *event) void SeekableWidget::mouseReleaseEvent(QMouseEvent *event) { + if (HandRelease(event)) { + return; + } + if (selection_manager_.IsDragging()) { MultiUndoCommand *command = new MultiUndoCommand(); selection_manager_.DragStop(command);