Header: Fixed mouse over coordinates

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index a00efb14664534e689464b398040b39d302011ab..802f897a607be89be0d1e6dfd684d65f61e75f57 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -26,8 +26,6 @@
 
 #include <assert.h>
 
-#include <boost/foreach.hpp>
-
 #include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
@@ -36,16 +34,17 @@
 
 #include <pv/widgets/popup.h>
 
-using boost::shared_ptr;
 using std::max;
 using std::make_pair;
 using std::pair;
+using std::shared_ptr;
 using std::vector;
 
 namespace pv {
 namespace view {
 
 const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
 
 Header::Header(View &parent) :
        MarginWidget(parent),
@@ -70,7 +69,7 @@ QSize Header::sizeHint() const
        int max_width = 0;
 
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                assert(t);
 
                if (t->enabled()) {
@@ -78,15 +77,15 @@ QSize Header::sizeHint() const
                }
        }
 
-       return QSize(max_width + Padding, 0);
+       return QSize(max_width + Padding + BaselineOffset, 0);
 }
 
 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());
 
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
        {
                assert(t);
                if (t->pt_in_label_rect(0, w, pt))
@@ -99,7 +98,7 @@ shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 void Header::clear_selection()
 {
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+       for (const shared_ptr<Trace> t : traces) {
                assert(t);
                t->select(false);
        }
@@ -109,14 +108,17 @@ void Header::clear_selection()
 
 void Header::paintEvent(QPaintEvent*)
 {
-       const int w = width();
+       // The trace labels are not drawn with the arrows exactly on the
+       // left edge of the widget, because then the selection shadow
+       // would be clipped away.
+       const int w = width() - BaselineOffset;
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
        const bool dragging = !_drag_traces.empty();
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
        {
                assert(t);
 
@@ -138,7 +140,7 @@ void Header::mousePressEvent(QMouseEvent *event)
                _mouse_down_point = event->pos();
 
                // Save the offsets of any signals which will be dragged
-               BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               for (const shared_ptr<Trace> t : traces)
                        if (t->selected())
                                _drag_traces.push_back(
                                        make_pair(t, t->get_v_offset()));
@@ -168,7 +170,7 @@ void Header::mousePressEvent(QMouseEvent *event)
        if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
                // Unselect all other signals because the Ctrl is not
                // pressed
-               BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               for (const shared_ptr<Trace> t : traces)
                        if (t != mouse_over_trace)
                                t->select(false);
        }
@@ -190,9 +192,10 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
                        const shared_ptr<Trace> mouse_over_trace =
                                get_mouse_over_trace(event->pos());
                        if (mouse_over_trace) {
+                               const int w = width() - BaselineOffset;
                                Popup *const p =
                                        mouse_over_trace->create_popup(&_view);
-                               p->set_position(mapToGlobal(QPoint(width(),
+                               p->set_position(mapToGlobal(QPoint(w,
                                        mouse_over_trace->get_y())),
                                        Popup::Right);
                                p->show();
@@ -224,7 +227,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
                const int delta = event->pos().y() - _mouse_down_point.y();
 
                for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
-                       const boost::shared_ptr<Trace> trace((*i).first);
+                       const std::shared_ptr<Trace> trace((*i).first);
                        if (trace) {
                                const int y = (*i).second + delta;
                                const int y_snap =
@@ -268,7 +271,7 @@ void Header::keyPressEvent(QKeyEvent *e)
        case Qt::Key_Delete:
        {
                const vector< shared_ptr<Trace> > traces(_view.get_traces());
-               BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               for (const shared_ptr<Trace> t : traces)
                        if (t->selected())
                                t->delete_pressed();    
                break;
@@ -279,7 +282,7 @@ void Header::keyPressEvent(QKeyEvent *e)
 void Header::on_signals_changed()
 {
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                assert(t);
                connect(t.get(), SIGNAL(visibility_changed()),
                        this, SLOT(on_trace_changed()));