RowItem: Renamed get_v_offset to v_offset

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 802f897a607be89be0d1e6dfd684d65f61e75f57..653cac483bc0d36ec37b4c57b01f168cf5f3f586 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -73,7 +73,7 @@ QSize Header::sizeHint() const
                assert(t);
 
                if (t->enabled()) {
-                       max_width = max(max_width, (int)t->get_label_rect(0).width());
+                       max_width = max(max_width, (int)t->label_rect(0).width());
                }
        }
 
@@ -88,7 +88,7 @@ shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
        for (const shared_ptr<Trace> t : traces)
        {
                assert(t);
-               if (t->pt_in_label_rect(0, w, pt))
+               if (t->enabled() && t->label_rect(w).contains(pt))
                        return t;
        }
 
@@ -122,8 +122,8 @@ void Header::paintEvent(QPaintEvent*)
        {
                assert(t);
 
-               const bool highlight = !dragging && t->pt_in_label_rect(
-                       0, w, _mouse_point);
+               const bool highlight = !dragging &&
+                       t->label_rect(w).contains(_mouse_point);
                t->paint_label(painter, w, highlight);
        }
 
@@ -143,7 +143,7 @@ void Header::mousePressEvent(QMouseEvent *event)
                for (const shared_ptr<Trace> t : traces)
                        if (t->selected())
                                _drag_traces.push_back(
-                                       make_pair(t, t->get_v_offset()));
+                                       make_pair(t, t->v_offset()));
        }
 
        // Select the signal if it has been clicked
@@ -163,7 +163,7 @@ void Header::mousePressEvent(QMouseEvent *event)
                        if (event->button() & Qt::LeftButton)
                                _drag_traces.push_back(
                                        make_pair(mouse_over_trace,
-                                       mouse_over_trace->get_v_offset()));
+                                       mouse_over_trace->v_offset()));
                }
        }