X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=69e345660ab3558cf677ef66a2d7b7083602b65a;hb=cc88566ce77bed57358a82dec5da648feb66d10b;hp=9913b5cc1640550a5cf563849a1c0a361a3f5cb2;hpb=af503b104d890a357c736c678bb00296d889c090;p=pulseview.git diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp index 9913b5c..69e3456 100644 --- a/pv/view/viewwidget.cpp +++ b/pv/view/viewwidget.cpp @@ -64,8 +64,11 @@ void ViewWidget::item_clicked(const shared_ptr &item) bool ViewWidget::accept_drag() const { const vector< shared_ptr > items(view_.time_items()); + const vector< shared_ptr > trace_tree_items( + view_.list_by_type()); - const bool any_row_items_selected = any_of(view_.begin(), view_.end(), + const bool any_row_items_selected = any_of( + trace_tree_items.begin(), trace_tree_items.end(), [](const shared_ptr &r) { return r->selected(); }); const bool any_time_items_selected = any_of(items.begin(), items.end(), @@ -75,7 +78,7 @@ bool ViewWidget::accept_drag() const { // Check all the drag items share a common owner TraceTreeItemOwner *item_owner = nullptr; - for (shared_ptr r : view_) + for (shared_ptr r : trace_tree_items) if (r->dragging()) { if (!item_owner) item_owner = r->owner(); @@ -106,7 +109,9 @@ void ViewWidget::drag_items(const QPoint &delta) // Drag the row items TraceTreeItemOwner *item_owner = nullptr; - for (std::shared_ptr r : view_) + const vector< shared_ptr > trace_tree_items( + view_.list_by_type()); + for (shared_ptr r : trace_tree_items) if (r->dragging()) { item_owner = r->owner(); r->drag_by(delta); @@ -118,7 +123,7 @@ void ViewWidget::drag_items(const QPoint &delta) if (item_owner) { item_dragged = true; item_owner->restack_items(); - for (const auto &r : *item_owner) + for (shared_ptr r : trace_tree_items) r->animate_to_layout_v_offset(); }