X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.cpp;h=3249d3da77daaa7cfaf40960fcddc38fc970ea7e;hb=ee7fd68c0851423c9a5c6ce244ba3fb4e28bbfc3;hp=65b9481d12ff8261d321143d01b2add95c38ae5a;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a;p=pulseview.git

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 65b9481d..3249d3da 100644
--- a/pv/views/trace/timemarker.cpp
+++ b/pv/views/trace/timemarker.cpp
@@ -25,6 +25,7 @@
 #include "timemarker.hpp"
 
 #include "pv/widgets/timestampspinbox.hpp"
+#include "ruler.hpp"
 #include "view.hpp"
 
 #include <QApplication>
@@ -49,8 +50,7 @@ TimeMarker::TimeMarker(
 	color_(color),
 	time_(time),
 	value_action_(nullptr),
-	value_widget_(nullptr),
-	updating_value_widget_(false)
+	value_widget_(nullptr)
 {
 }
 
@@ -64,9 +64,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 	time_ = time;
 
 	if (value_widget_) {
-		updating_value_widget_ = true;
-		value_widget_->setValue(time);
-		updating_value_widget_ = false;
+		QSignalBlocker blocker(value_widget_);
+		value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time));
 	}
 
 	view_.time_item_appearance_changed(true, true);
@@ -80,7 +79,9 @@ float TimeMarker::get_x() 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
@@ -177,7 +178,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	popup->setLayout(form);
 
 	value_widget_ = new pv::widgets::TimestampSpinBox(parent);
-	value_widget_->setValue(time_);
+	value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time_));
 
 	connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
 		this, SLOT(on_value_changed(const pv::util::Timestamp&)));
@@ -189,8 +190,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
 {
-	if (!updating_value_widget_)
-		set_time(value);
+	set_time(view_.ruler()->get_absolute_time_from_ruler_time(value));
 }
 
 } // namespace trace