X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e0e280b2826dc3c988c362d1c2eaecaf0a508f29;hp=63679012a52947d92b7d1fc67f40948a042f339b;hb=7c68ddaee897d069f817c2c0184bd8c1f73d826a;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 63679012..e0e280b2 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -71,18 +71,15 @@ boost::shared_ptr Header::get_mouse_over_signal( { assert(s); - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); - - if (s->pt_in_label_rect(signal_heading_rect, pt)) + if (s->pt_in_label_rect(s->get_v_offset() - v_offset, + 0, w, pt)) return s; } return shared_ptr(); } -void Header::paintEvent(QPaintEvent *event) +void Header::paintEvent(QPaintEvent*) { const int w = width(); const vector< shared_ptr > sigs( @@ -97,13 +94,10 @@ void Header::paintEvent(QPaintEvent *event) { assert(s); - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); - + const int y = s->get_v_offset() - v_offset; const bool highlight = !dragging && s->pt_in_label_rect( - signal_heading_rect, _mouse_point); - s->paint_label(painter, signal_heading_rect, highlight); + y, 0, w, _mouse_point); + s->paint_label(painter, y, w, highlight); } painter.end(); @@ -200,7 +194,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update();