X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=a834f9c0d54eba1c236f18558cfe471bbb3f700a;hp=9913b5cc1640550a5cf563849a1c0a361a3f5cb2;hb=3d79f521396c8e908fd237f5328153165099f5c3;hpb=af503b104d890a357c736c678bb00296d889c090

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 9913b5cc..a834f9c0 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -48,7 +48,6 @@ void ViewWidget::clear_selection()
 	const auto items = this->items();
 	for (auto &i : items)
 		i->select(false);
-	update();
 }
 
 void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
@@ -64,8 +63,11 @@ void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 bool ViewWidget::accept_drag() const
 {
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+		view_.list_by_type<TraceTreeItem>());
 
-	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<TraceTreeItem> &r) { return r->selected(); });
 
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
@@ -75,7 +77,7 @@ bool ViewWidget::accept_drag() const
 	{
 		// Check all the drag items share a common owner
 		TraceTreeItemOwner *item_owner = nullptr;
-		for (shared_ptr<TraceTreeItem> r : view_)
+		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 			if (r->dragging()) {
 				if (!item_owner)
 					item_owner = r->owner();
@@ -105,21 +107,30 @@ void ViewWidget::drag_items(const QPoint &delta)
 	bool item_dragged = false;
 
 	// Drag the row items
-	TraceTreeItemOwner *item_owner = nullptr;
-	for (std::shared_ptr<TraceTreeItem> r : view_)
+	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 (const auto &r : *item_owner)
-			r->animate_to_layout_v_offset();
+		for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+			i->animate_to_layout_v_offset();
 	}
 
 	// Drag the time items
@@ -182,7 +193,6 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
 		drag();
 
 	selection_changed();
-	update();
 }
 
 void ViewWidget::mouse_left_release_event(QMouseEvent *event)
@@ -284,8 +294,6 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 
 		// Do the drag
 		drag_items(e->pos() - mouse_down_point_);
-
-		update();
 	}
 }