X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fheader.cpp;h=17dd382dd4846bf8d44b85a8c5e881596bd47f88;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hp=7c68f302846b5b4f6d41b020abdef6c15f98df69;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 7c68f302..17dd382d 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -34,16 +34,17 @@
 
 #include <pv/widgets/popup.h>
 
-using boost::shared_ptr;
 using std::max;
 using std::make_pair;
 using std::pair;
+using std::shared_ptr;
 using std::vector;
 
 namespace pv {
 namespace view {
 
 const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
 
 Header::Header(View &parent) :
 	MarginWidget(parent),
@@ -72,22 +73,22 @@ QSize Header::sizeHint() const
 		assert(t);
 
 		if (t->enabled()) {
-			max_width = max(max_width, (int)t->get_label_rect(0).width());
+			max_width = max(max_width, (int)t->label_rect(0).width());
 		}
 	}
 
-	return QSize(max_width + Padding, 0);
+	return QSize(max_width + Padding + BaselineOffset, 0);
 }
 
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 {
-	const int w = width();
+	const int w = width() - BaselineOffset;
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	for (const shared_ptr<Trace> t : traces)
 	{
 		assert(t);
-		if (t->pt_in_label_rect(0, w, pt))
+		if (t->enabled() && t->label_rect(w).contains(pt))
 			return t;
 	}
 
@@ -107,7 +108,10 @@ void Header::clear_selection()
 
 void Header::paintEvent(QPaintEvent*)
 {
-	const int w = width();
+	// 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 vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	QPainter painter(this);
@@ -118,8 +122,8 @@ void Header::paintEvent(QPaintEvent*)
 	{
 		assert(t);
 
-		const bool highlight = !dragging && t->pt_in_label_rect(
-			0, w, _mouse_point);
+		const bool highlight = !dragging &&
+			t->label_rect(w).contains(_mouse_point);
 		t->paint_label(painter, w, highlight);
 	}
 
@@ -188,9 +192,10 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
 			const shared_ptr<Trace> mouse_over_trace =
 				get_mouse_over_trace(event->pos());
 			if (mouse_over_trace) {
+				const int w = width() - BaselineOffset;
 				Popup *const p =
 					mouse_over_trace->create_popup(&_view);
-				p->set_position(mapToGlobal(QPoint(width(),
+				p->set_position(mapToGlobal(QPoint(w,
 					mouse_over_trace->get_y())),
 					Popup::Right);
 				p->show();
@@ -222,7 +227,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 		const int delta = event->pos().y() - _mouse_down_point.y();
 
 		for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
-			const boost::shared_ptr<Trace> trace((*i).first);
+			const std::shared_ptr<Trace> trace((*i).first);
 			if (trace) {
 				const int y = (*i).second + delta;
 				const int y_snap =