X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=41dffca1f92323c9ece2090893aea04e90afd30f;hp=08b3fdd2e07fa48ecfcc9a6fa9bb986bfffbcc9f;hb=786b76785856c6cf8f5916c0b8d76a61695762f9;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 08b3fdd2..41dffca1 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -35,7 +35,7 @@
 #include <QPainter>
 #include <QRect>
 
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
 #include <pv/widgets/popup.hpp>
 
 using boost::make_filter_iterator;
@@ -60,12 +60,8 @@ static bool item_selected(shared_ptr<RowItem> r)
 }
 
 Header::Header(View &parent) :
-	MarginWidget(parent),
-	dragging_(false)
+	MarginWidget(parent)
 {
-	setFocusPolicy(Qt::ClickFocus);
-	setMouseTracking(true);
-
 	connect(&view_, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
 }
@@ -75,15 +71,20 @@ QSize Header::sizeHint() const
 	QRectF max_rect(-Padding, 0, Padding, 0);
 	for (auto &i : view_)
 		if (i->enabled())
-			max_rect = max_rect.united(i->label_rect(0));
+			max_rect = max_rect.united(i->label_rect(QRect()));
 	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 int w = width() - BaselineOffset;
+	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
+}
+
+shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+{
+	const QRect r(0, 0, width() - BaselineOffset, height());
 	for (auto &i : view_)
-		if (i->enabled() && i->label_rect(w).contains(pt))
+		if (i->enabled() && i->label_rect(r).contains(pt))
 			return i;
 	return shared_ptr<RowItem>();
 }
@@ -95,25 +96,12 @@ void Header::clear_selection()
 	update();
 }
 
-void Header::show_popup(const shared_ptr<RowItem> &item)
-{
-	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();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
 	// The trace labels are not drawn with the arrows exactly on the
 	// left edge of the widget, because then the selection shadow
 	// would be clipped away.
-	const int w = width() - BaselineOffset;
+	const QRect rect(0, 0, width() - BaselineOffset, height());
 
 	vector< shared_ptr<RowItem> > row_items(
 		view_.begin(), view_.end());
@@ -130,8 +118,8 @@ void Header::paintEvent(QPaintEvent*)
 		assert(r);
 
 		const bool highlight = !dragging_ &&
-			r->label_rect(w).contains(mouse_point_);
-		r->paint_label(painter, w, highlight);
+			r->label_rect(rect).contains(mouse_point_);
+		r->paint_label(painter, rect, highlight);
 	}
 
 	painter.end();
@@ -172,7 +160,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 	assert(event);
 
 	mouse_down_point_ = event->pos();
-	mouse_down_item_ = get_mouse_over_row_item(event->pos());
+	mouse_down_item_ = get_mouse_over_item(event->pos());
 
 	if (event->button() & Qt::LeftButton)
 		mouseLeftPressEvent(event);
@@ -187,7 +175,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 
 	// Unselect everything if control is not pressed
 	const shared_ptr<RowItem> mouse_over =
-		get_mouse_over_row_item(event->pos());
+		get_mouse_over_item(event->pos());
 
 	for (auto &r : view_)
 		r->drag_release();
@@ -246,11 +234,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();
@@ -272,7 +260,7 @@ void Header::leaveEvent(QEvent*)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<RowItem> r = get_mouse_over_row_item(mouse_point_);
+	const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
 	if (!r)
 		return;