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

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 65b9481d..c58aa08d 100644
--- a/pv/views/trace/timemarker.cpp
+++ b/pv/views/trace/timemarker.cpp
@@ -65,7 +65,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 
 	if (value_widget_) {
 		updating_value_widget_ = true;
-		value_widget_->setValue(time);
+		value_widget_->setValue(view_.absolute_to_ruler_time(time));
 		updating_value_widget_ = false;
 	}
 
@@ -80,7 +80,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 +179,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_.absolute_to_ruler_time(time_));
 
 	connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
 		this, SLOT(on_value_changed(const pv::util::Timestamp&)));
@@ -190,7 +192,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_to_absolute_time(value));
 }
 
 } // namespace trace