Fix #1292/1294 by snapping to any edge when not hovering over a signal

[pulseview.git] / pv / views / trace / timemarker.cpp

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 0718f3cc8780704315e0e649b39c146a7a0e11bf..266007a57053c220f59a87fe80eb630438a413c0 100644 (file)
--- a/pv/views/trace/timemarker.cpp
+++ b/pv/views/trace/timemarker.cpp
@@ -44,9 +44,9 @@ namespace trace {
 const int TimeMarker::ArrowSize = 4;
 
 TimeMarker::TimeMarker(
 const int TimeMarker::ArrowSize = 4;
 
 TimeMarker::TimeMarker(

-       View &view, const QColor &colour, const pv::util::Timestamp& time) :
+       View &view, const QColor &color, const pv::util::Timestamp& time) :

        TimeItem(view),
        TimeItem(view),

-       colour_(colour),
+       color_(color),

        time_(time),
        value_action_(nullptr),
        value_widget_(nullptr),
        time_(time),
        value_action_(nullptr),
        value_widget_(nullptr),


@@ -80,7 +80,9 @@ float TimeMarker::get_x() const
 
 QPoint TimeMarker::drag_point(const QRect &rect) const
 {
 
 QPoint TimeMarker::drag_point(const QRect &rect) const
 {

-       return QPoint(get_x(), rect.bottom());
+       (void)rect;
+
+       return QPoint(get_x(), view_.mapFromGlobal(QCursor::pos()).y());

 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const


@@ -140,18 +142,18 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
        }
 
        p.setPen(Qt::transparent);
        }
 
        p.setPen(Qt::transparent);

-       p.setBrush(hover ? colour_.lighter() : colour_);
+       p.setBrush(hover ? color_.lighter() : color_);

        p.drawPolygon(points, countof(points));
 
        p.drawPolygon(points, countof(points));
 

-       p.setPen(colour_.lighter());
+       p.setPen(color_.lighter());

        p.setBrush(Qt::transparent);
        p.drawPolygon(highlight_points, countof(highlight_points));
 
        p.setBrush(Qt::transparent);
        p.drawPolygon(highlight_points, countof(highlight_points));
 

-       p.setPen(colour_.darker());
+       p.setPen(color_.darker());

        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 

-       p.setPen(select_text_colour(colour_));
+       p.setPen(select_text_color(color_));

        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 


@@ -161,7 +163,7 @@ void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
                return;
 
        const float x = get_x();
                return;
 
        const float x = get_x();

-       p.setPen(colour_.darker());
+       p.setPen(color_.darker());

        p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
 }
 
        p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
 }