X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=26aae49fada6f9a5a7d2d533ad77b2c8e017baaa;hp=49a846e286a594a76db1a74063595c1accdab13a;hb=803cdac41caf71af9298e3f612468aa522a107d5;hpb=2f7982367e8382e05c862de7afc71075ded5f606

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 49a846e2..26aae49f 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -62,8 +62,6 @@ static bool item_selected(shared_ptr<RowItem> r)
 Header::Header(View &parent) :
 	MarginWidget(parent)
 {
-	connect(&view_, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
 }
 
 QSize Header::sizeHint() const
@@ -94,39 +92,6 @@ shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 	return shared_ptr<RowItem>();
 }
 
-bool Header::accept_drag() const
-{
-	// Check all the drag items share a common owner
-	RowItemOwner *item_owner = nullptr;
-	for (shared_ptr<RowItem> r : view_)
-		if (r->dragging()) {
-			if (!item_owner)
-				item_owner = r->owner();
-			else if(item_owner != r->owner())
-				return false;
-		}
-
-	return item_owner;
-}
-
-void Header::drag_items(const QPoint &delta)
-{
-	RowItemOwner *item_owner = nullptr;
-	for (std::shared_ptr<RowItem> r : view_)
-		if (r->dragging()) {
-			item_owner = r->owner();
-			r->drag_by(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();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
 	// The trace labels are not drawn with the arrows exactly on the
@@ -148,7 +113,7 @@ void Header::paintEvent(QPaintEvent*)
 	{
 		assert(r);
 
-		const bool highlight = !dragging_ &&
+		const bool highlight = !item_dragging_ &&
 			r->label_rect(rect).contains(mouse_point_);
 		r->paint_label(painter, rect, highlight);
 	}
@@ -193,11 +158,6 @@ void Header::keyPressEvent(QKeyEvent *e)
 		on_ungroup();
 }
 
-void Header::on_signals_moved()
-{
-	update();
-}
-
 void Header::on_group()
 {
 	vector< shared_ptr<RowItem> > selected_items(