X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=c94e2d613d2ef7c25f9b5319a93d133c9e30f866;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hp=b9261f9753d060bdaffbb48ab7c52a35d4a5210b;hpb=0dda6fe595932b2e340930104fad8ac4fc574895;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index b9261f97..c94e2d61 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -84,15 +84,6 @@ void Header::clear_selection()
 	update();
 }
 
-void Header::signals_updated()
-{
-	for (shared_ptr<RowItem> r : _view) {
-		assert(r);
-		connect(r.get(), SIGNAL(appearance_changed()),
-			this, SLOT(on_trace_changed()));
-	}
-}
-
 void Header::show_popup(const shared_ptr<RowItem> &item)
 {
 	using pv::widgets::Popup;
@@ -101,7 +92,7 @@ void Header::show_popup(const shared_ptr<RowItem> &item)
 	if (!p)
 		return;
 
-	const QPoint pt(width() - BaselineOffset, item->get_y());
+	const QPoint pt(width() - BaselineOffset, item->get_visual_y());
 	p->set_position(mapToGlobal(pt), Popup::Right);
 	p->show();
 }
@@ -118,7 +109,7 @@ void Header::paintEvent(QPaintEvent*)
 
 	stable_sort(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-			return a->v_offset() < b->v_offset(); });
+			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
@@ -137,26 +128,26 @@ void Header::paintEvent(QPaintEvent*)
 
 void Header::mouseLeftPressEvent(QMouseEvent *event)
 {
+	(void)event;
+
 	const bool ctrl_pressed =
 		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
 	// Clear selection if control is not pressed and this item is unselected
-	const shared_ptr<RowItem> mouse_over =
-		get_mouse_over_row_item(event->pos());
-	if (!ctrl_pressed && (!mouse_over || !mouse_over->selected()))
+	if ((!_mouse_down_item || !_mouse_down_item->selected()) &&
+		!ctrl_pressed)
 		for (shared_ptr<RowItem> r : _view)
 			r->select(false);
 
 	// Set the signal selection state if the item has been clicked
-	if (mouse_over) {
+	if (_mouse_down_item) {
 		if (ctrl_pressed)
-			mouse_over->select(!mouse_over->selected());
+			_mouse_down_item->select(!_mouse_down_item->selected());
 		else
-			mouse_over->select(true);
+			_mouse_down_item->select(true);
 	}
 
 	// Save the offsets of any signals which will be dragged
-	_mouse_down_point = event->pos();
 	for (const shared_ptr<RowItem> r : _view)
 		if (r->selected())
 			r->drag();
@@ -168,6 +159,10 @@ void Header::mouseLeftPressEvent(QMouseEvent *event)
 void Header::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	_mouse_down_point = event->pos();
+	_mouse_down_item = get_mouse_over_row_item(event->pos());
+
 	if (event->button() & Qt::LeftButton)
 		mouseLeftPressEvent(event);
 }
@@ -187,16 +182,16 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 		r->drag_release();
 
 	if (_dragging)
-		_view.normalize_layout();
+		_view.restack_all_row_items();
 	else
 	{
 		if (!ctrl_pressed) {
 			for (shared_ptr<RowItem> r : _view)
-				if (mouse_over != r)
+				if (_mouse_down_item != r)
 					r->select(false);
 
-			if (mouse_over)
-				show_popup(mouse_over);
+			if (_mouse_down_item)
+				show_popup(_mouse_down_item);
 		}
 	}
 
@@ -208,6 +203,8 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
 	assert(event);
 	if (event->button() & Qt::LeftButton)
 		mouseLeftReleaseEvent(event);
+
+	_mouse_down_item = nullptr;
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
@@ -242,12 +239,15 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
 	for (std::shared_ptr<RowItem> r : _view)
 		if (r->dragging()) {
-			r->set_v_offset(r->drag_point().y() + delta);
+			r->force_to_v_offset(r->drag_point().y() + delta);
 
 			// Ensure the trace is selected
 			r->select();
 		}
 
+	item_owner->restack_items();
+	for (const auto &r : *item_owner)
+		r->animate_to_layout_v_offset();
 	signals_moved();
 
 	update();
@@ -293,11 +293,5 @@ void Header::on_signals_moved()
 	update();
 }
 
-void Header::on_trace_changed()
-{
-	update();
-	geometry_updated();
-}
-
 } // namespace view
 } // namespace pv