RowItem: Pass rect into label_rect

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

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 765f0973229739e4cf7114333c2d58da70f3d1aa..13ba025f9c1235ed01576fe736812e963c73ad79 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -26,7 +26,7 @@
 #include <QMenu>
 #include <QPainter>
 
-#include "tracegroup.h"
+#include "tracegroup.hpp"
 
 using std::pair;
 using std::shared_ptr;
@@ -42,7 +42,7 @@ const QColor TraceGroup::LineColour(QColor(0x55, 0x57, 0x53));
 
 TraceGroup::~TraceGroup()
 {
-       _owner = nullptr;
+       owner_ = nullptr;
        clear_child_items();
 }
 
@@ -52,28 +52,28 @@ 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();
+       assert(owner_);
+       return owner_->session();
 }
 
-const pv::SigSession& TraceGroup::session() const
+const pv::Session& TraceGroup::session() const
 {
-       assert(_owner);
-       return _owner->session();
+       assert(owner_);
+       return owner_->session();
 }
 
 pv::view::View* TraceGroup::view()
 {
-       assert(_owner);
-       return _owner->view();
+       assert(owner_);
+       return owner_->view();
 }
 
 const pv::view::View* TraceGroup::view() const
 {
-       assert(_owner);
-       return _owner->view();
+       assert(owner_);
+       return owner_->view();
 }
 
 pair<int, int> TraceGroup::v_extents() const
@@ -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)
@@ -152,7 +152,7 @@ pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
 
 int TraceGroup::owner_visual_v_offset() const
 {
-       return _owner ? visual_v_offset() + _owner->owner_visual_v_offset() : 0;
+       return owner_ ? visual_v_offset() + owner_->owner_visual_v_offset() : 0;
 }
 
 void TraceGroup::restack_items()
@@ -192,7 +192,7 @@ void TraceGroup::restack_items()
 
 unsigned int TraceGroup::depth() const
 {
-       return _owner ? _owner->depth() + 1 : 0;
+       return owner_ ? owner_->depth() + 1 : 0;
 }
 
 void TraceGroup::ungroup()
@@ -202,9 +202,9 @@ void TraceGroup::ungroup()
        clear_child_items();
 
        for (shared_ptr<RowItem> r : items)
-               _owner->add_child_item(r);
+               owner_->add_child_item(r);
 
-       _owner->remove_child_item(shared_from_this());
+       owner_->remove_child_item(shared_from_this());
 }
 
 void TraceGroup::on_ungroup()
@@ -214,14 +214,14 @@ void TraceGroup::on_ungroup()
 
 void TraceGroup::appearance_changed(bool label, bool content)
 {
-       if (_owner)
-               _owner->appearance_changed(label, content);
+       if (owner_)
+               owner_->appearance_changed(label, content);
 }
 
 void TraceGroup::extents_changed(bool horz, bool vert)
 {
-       if (_owner)
-               _owner->extents_changed(horz, vert);
+       if (owner_)
+               owner_->extents_changed(horz, vert);
 }
 
 } // namespace view