X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=13ba025f9c1235ed01576fe736812e963c73ad79;hp=272fc1a1e3b341823e82133c099d4f35f392c617;hb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;hpb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp index 272fc1a1..13ba025f 100644 --- a/pv/view/tracegroup.cpp +++ b/pv/view/tracegroup.cpp @@ -81,9 +81,9 @@ pair 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 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)