ViewItem: Use drag_point() with drag_by()

[pulseview.git] / pv / view / tracegroup.cpp

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 272fc1a1e3b341823e82133c099d4f35f392c617..b155778b37e354d99c2c6eb842faa7a3a887f8be 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -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)
@@ -212,10 +212,10 @@ void TraceGroup::on_ungroup()
        ungroup();
 }
 
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::row_item_appearance_changed(bool label, bool content)
 {
        if (owner_)
-               owner_->appearance_changed(label, content);
+               owner_->row_item_appearance_changed(label, content);
 }
 
 void TraceGroup::extents_changed(bool horz, bool vert)