Fixes

[pulseview.git] / pv / views / trace / viewwidget.cpp

diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp
index 73c361f47d802dd469b8ad59f9a2f4e47f285060..499471b91001bf3488d4b893cac0591548b7ad07 100644 (file)
--- a/pv/views/trace/viewwidget.cpp
+++ b/pv/views/trace/viewwidget.cpp
@@ -105,9 +105,9 @@ void ViewWidget::drag_items(const QPoint &delta)
        bool item_dragged = false;
 
        // Drag the row items
-       const vector< shared_ptr<RowItem> > row_items(
-               view_.list_by_type<RowItem>());
-       for (const shared_ptr<RowItem>& r : row_items)
+       const vector< shared_ptr<ViewItem> > row_items(
+               view_.list_by_type<ViewItem>());
+       for (const shared_ptr<ViewItem>& r : row_items)
                if (r->dragging()) {
                        r->drag_by(delta);
 
@@ -253,7 +253,11 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
        assert(event);
 
        if (event->button() & Qt::LeftButton) {
+               if (event->modifiers() & Qt::ShiftModifier)
+                       view_.show_cursors(false);
+
                mouse_down_point_ = event->pos();
+               mouse_down_offset_ = view_.offset() + event->pos().x() * view_.scale();
                mouse_down_item_ = get_mouse_over_item(event->pos());
                mouse_left_press_event(event);
        }
@@ -287,20 +291,36 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event)
 
        if (!event->buttons())
                item_hover(get_mouse_over_item(event->pos()), event->pos());
-       else if (event->buttons() & Qt::LeftButton) {
-               if (!item_dragging_) {
-                       if ((event->pos() - mouse_down_point_).manhattanLength() <
-                               QApplication::startDragDistance())
-                               return;
 
-                       if (!accept_drag())
-                               return;
+       if (event->buttons() & Qt::LeftButton) {
+               if (event->modifiers() & Qt::ShiftModifier) {
+                       // Cursor drag
+                       pv::util::Timestamp current_offset = view_.offset() + event->pos().x() * view_.scale();
 
-                       item_dragging_ = true;
-               }
+                       const int drag_distance = qAbs(current_offset.convert_to<double>() -
+                               mouse_down_offset_.convert_to<double>()) / view_.scale();
+
+                       if (drag_distance > QApplication::startDragDistance()) {
+                               view_.show_cursors(true);
+                               view_.set_cursors(mouse_down_offset_, current_offset);
+                       } else
+                               view_.show_cursors(false);
+
+               } else {
+                       if (!item_dragging_) {
+                               if ((event->pos() - mouse_down_point_).manhattanLength() <
+                                       QApplication::startDragDistance())
+                                       return;
 
-               // Do the drag
-               drag_items(event->pos() - mouse_down_point_);
+                               if (!accept_drag())
+                                       return;
+
+                               item_dragging_ = true;
+                       }
+
+                       // Do the drag
+                       drag_items(event->pos() - mouse_down_point_);
+               }
        }
 }