DecodeTrace: Removed set_view

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 2e497761b18a761ca6dd4785252e7bfc96e0030a..17dd382dd4846bf8d44b85a8c5e881596bd47f88 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());
                }
        }
 
@@ -82,13 +82,13 @@ QSize Header::sizeHint() const
 
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 {
-       const int w = width();
+       const int w = width() - BaselineOffset;
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
        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);
        }