X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=13ba025f9c1235ed01576fe736812e963c73ad79;hp=665b4ad186c1403cb3a888f9f73e4e94851c37df;hb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 665b4ad1..13ba025f 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -52,13 +52,13 @@ bool TraceGroup::enabled() const
 		[](const shared_ptr<RowItem> &r) { return r->enabled(); });
 }
 
-pv::SigSession& TraceGroup::session()
+pv::Session& TraceGroup::session()
 {
 	assert(owner_);
 	return owner_->session();
 }
 
-const pv::SigSession& TraceGroup::session() const
+const pv::Session& TraceGroup::session() const
 {
 	assert(owner_);
 	return owner_->session();
@@ -81,9 +81,9 @@ pair<int, int> TraceGroup::v_extents() const
 	return RowItemOwner::v_extents();
 }
 
-void TraceGroup::paint_label(QPainter &p, int right, bool hover)
+void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
-	const QRectF r = label_rect(right).adjusted(
+	const QRectF r = label_rect(rect).adjusted(
 		LineThickness / 2, LineThickness / 2,
 		-LineThickness / 2, -LineThickness / 2);
 
@@ -112,15 +112,15 @@ void TraceGroup::paint_label(QPainter &p, int right, bool hover)
 	p.drawPolyline(points, countof(points));
 }
 
-QRectF TraceGroup::label_rect(int right) const
+QRectF TraceGroup::label_rect(const QRectF &rect) const
 {
-	QRectF rect;
+	QRectF child_rect;
 	for (const shared_ptr<RowItem> r : child_items())
 		if (r && r->enabled())
-			rect = rect.united(r->label_rect(right));
+			child_rect = child_rect.united(r->label_rect(rect));
 
-	return QRectF(rect.x() - Width - Padding, rect.y(),
-		Width, rect.height());
+	return QRectF(child_rect.x() - Width - Padding, child_rect.y(),
+		Width, child_rect.height());
 }
 
 bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)