X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=766347d5272a09962de138584a57e97cbf479ffa;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hp=4b02c1944d35540bf78f1c220716b213ce4433e4;hpb=dbfae3f1b55b984c7ee7e619a8da53b77db98c90;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 4b02c194..766347d5 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -75,33 +75,23 @@ QSize Header::sizeHint() const
 	return QSize(max_rect.width() + Padding + BaselineOffset, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+QSize Header::extended_size_hint() const
 {
-	const QRect r(0, 0, width() - BaselineOffset, height());
-	for (auto &i : view_)
-		if (i->enabled() && i->label_rect(r).contains(pt))
-			return i;
-	return shared_ptr<RowItem>();
+	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-void Header::clear_selection()
+vector< shared_ptr<ViewItem> > Header::items()
 {
-	for (auto &i : view_)
-		i->select(false);
-	update();
+	return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
 }
 
-void Header::show_popup(const shared_ptr<RowItem> &item)
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
-	using pv::widgets::Popup;
-
-	Popup *const p = item->create_popup(&view_);
-	if (!p)
-		return;
-
-	const QPoint pt(width() - BaselineOffset, item->get_visual_y());
-	p->set_position(mapToGlobal(pt), Popup::Right);
-	p->show();
+	const QRect r(0, 0, width() - BaselineOffset, height());
+	for (auto &i : view_)
+		if (i->enabled() && i->label_rect(r).contains(pt))
+			return i;
+	return shared_ptr<RowItem>();
 }
 
 void Header::paintEvent(QPaintEvent*)
@@ -133,47 +123,6 @@ void Header::paintEvent(QPaintEvent*)
 	painter.end();
 }
 
-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
-	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_down_item_) {
-		if (ctrl_pressed)
-			mouse_down_item_->select(!mouse_down_item_->selected());
-		else
-			mouse_down_item_->select(true);
-	}
-
-	// Save the offsets of any signals which will be dragged
-	for (const shared_ptr<RowItem> r : view_)
-		if (r->selected())
-			r->drag();
-
-	selection_changed();
-	update();
-}
-
-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);
-}
-
 void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
@@ -182,8 +131,8 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
 	// Unselect everything if control is not pressed
-	const shared_ptr<RowItem> mouse_over =
-		get_mouse_over_row_item(event->pos());
+	const shared_ptr<ViewItem> mouse_over =
+		get_mouse_over_item(event->pos());
 
 	for (auto &r : view_)
 		r->drag_release();
@@ -242,11 +191,11 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	// Do the drag
 	dragging_ = true;
 
-	const int delta = event->pos().y() - mouse_down_point_.y();
+	const QPoint delta = event->pos() - mouse_down_point_;
 
 	for (std::shared_ptr<RowItem> r : view_)
 		if (r->dragging()) {
-			r->force_to_v_offset(r->drag_point().y() + delta);
+			r->drag_by(delta);
 
 			// Ensure the trace is selected
 			r->select();
@@ -260,15 +209,9 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	update();
 }
 
-void Header::leaveEvent(QEvent*)
-{
-	mouse_point_ = QPoint(-1, -1);
-	update();
-}
-
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<RowItem> r = get_mouse_over_row_item(mouse_point_);
+	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
 	if (!r)
 		return;
 
@@ -295,13 +238,9 @@ void Header::keyPressEvent(QKeyEvent *e)
 {
 	assert(e);
 
-	if (e->key() == Qt::Key_Delete)
-	{
-		for (const shared_ptr<RowItem> r : view_)
-			if (r->selected())
-				r->delete_pressed();
-	}
-	else if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+	MarginWidget::keyPressEvent(e);
+
+	if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
 		on_group();
 	else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
 		on_ungroup();
@@ -322,8 +261,10 @@ void Header::on_group()
 			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	shared_ptr<TraceGroup> group(new TraceGroup());
+	shared_ptr<RowItem> mouse_down_item(
+		std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
 	shared_ptr<RowItem> focus_item(
-		mouse_down_item_ ? mouse_down_item_ : selected_items.front());
+		mouse_down_item ? mouse_down_item : selected_items.front());
 
 	assert(focus_item);
 	assert(focus_item->owner());