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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 08b3fdd2..780b1e3d 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,8 +60,7 @@ static bool item_selected(shared_ptr<RowItem> r)
 }
 
 Header::Header(View &parent) :
-	MarginWidget(parent),
-	dragging_(false)
+	MarginWidget(parent)
 {
 	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
@@ -75,15 +74,15 @@ 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)
 {
-	const int w = width() - BaselineOffset;
+	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>();
 }
@@ -113,7 +112,7 @@ 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 +129,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();