Viewport: Allow for vertical dragging as well

[pulseview.git] / pv / view / viewwidget.cpp

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 38732046f11f896756a79536e0a94db79234e8ae..30d96eb356259c9669bbfdd243f27db066d4ebfe 100644 (file)
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -73,8 +73,7 @@ bool ViewWidget::accept_drag() const
        const bool any_time_items_selected = any_of(items.begin(), items.end(),
                [](const shared_ptr<TimeItem> &i) { return i->selected(); });
 
-       if (any_row_items_selected && !any_time_items_selected)
-       {
+       if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
                TraceTreeItemOwner *item_owner = nullptr;
                for (shared_ptr<TraceTreeItem> r : trace_tree_items)
@@ -86,9 +85,7 @@ bool ViewWidget::accept_drag() const
                        }
 
                return true;
-       }
-       else if (any_time_items_selected && !any_row_items_selected)
-       {
+       } else if (any_time_items_selected && !any_row_items_selected) {
                return true;
        }
 
@@ -107,23 +104,30 @@ void ViewWidget::drag_items(const QPoint &delta)
        bool item_dragged = false;
 
        // Drag the row items
-       TraceTreeItemOwner *item_owner = nullptr;
-       const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
-               view_.list_by_type<TraceTreeItem>());
-       for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+       const vector< shared_ptr<RowItem> > row_items(
+               view_.list_by_type<RowItem>());
+       for (shared_ptr<RowItem> r : row_items)
                if (r->dragging()) {
-                       item_owner = r->owner();
                        r->drag_by(delta);
 
                        // Ensure the trace is selected
                        r->select();
+
+                       item_dragged = true;
                }
 
+       // If an item is being dragged, update the stacking
+       TraceTreeItemOwner *item_owner = nullptr;
+       const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+               view_.list_by_type<TraceTreeItem>());
+       for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+               if (i->dragging())
+                       item_owner = i->owner();
+
        if (item_owner) {
-               item_dragged = true;
                item_owner->restack_items();
-               for (shared_ptr<TraceTreeItem> r : trace_tree_items)
-                       r->animate_to_layout_v_offset();
+               for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+                       i->animate_to_layout_v_offset();
        }
 
        // Drag the time items
@@ -205,8 +209,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 
        if (item_dragging_)
                view_.restack_all_trace_tree_items();
-       else
-       {
+       else {
                if (!ctrl_pressed) {
                        for (shared_ptr<ViewItem> i : items)
                                if (mouse_down_item_ != i)
@@ -271,10 +274,8 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 
        if (!e->buttons())
                item_hover(get_mouse_over_item(e->pos()));
-       else if (e->buttons() & Qt::LeftButton)
-       {
-               if (!item_dragging_)
-               {
+       else if (e->buttons() & Qt::LeftButton) {
+               if (!item_dragging_) {
                        if ((e->pos() - mouse_down_point_).manhattanLength() <
                                QApplication::startDragDistance())
                                return;
@@ -287,8 +288,6 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 
                // Do the drag
                drag_items(e->pos() - mouse_down_point_);
-
-               update();
        }
 }