X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fcursor.cpp;h=80eaba232b1d8157b2bbfacbb40ebe202e79670a;hp=7a375c7aad49410450c5f41f0d6d8c949e6bcd38;hb=HEAD;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a

diff --git a/pv/views/trace/cursor.cpp b/pv/views/trace/cursor.cpp
index 7a375c7a..8462a3a6 100644
--- a/pv/views/trace/cursor.cpp
+++ b/pv/views/trace/cursor.cpp
@@ -25,6 +25,7 @@
 
 #include <QApplication>
 #include <QBrush>
+#include <QMenu>
 #include <QPainter>
 #include <QPointF>
 #include <QRect>
@@ -59,7 +60,8 @@ QString Cursor::get_text() const
 	const pv::util::Timestamp& diff = abs(time_ - other->time_);
 
 	return Ruler::format_time_with_distance(
-		diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
+		diff, view_.ruler()->get_ruler_time_from_absolute_time(time_),
+        view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
 }
 
 QRectF Cursor::label_rect(const QRectF &rect) const
@@ -70,7 +72,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 	const float x = get_x();
 
 	QFontMetrics m(QApplication::font());
-	QSize text_size = m.boundingRect(get_text()).size();
+	QSize text_size = m.boundingRect(get_display_text()).size();
 
 	const QSizeF label_size(
 		text_size.width() + LabelPadding.width() * 2,
@@ -88,6 +90,19 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 		return QRectF(x - label_size.width(), top, label_size.width(), height);
 }
 
+QMenu *Cursor::create_header_context_menu(QWidget *parent)
+{
+	QMenu *const menu = new QMenu(parent);
+
+	QAction *const snap_disable = new QAction(tr("Disable snapping"), this);
+	snap_disable->setCheckable(true);
+	snap_disable->setChecked(snapping_disabled_);
+	connect(snap_disable, &QAction::toggled, this, [=](bool checked){snapping_disabled_ = checked;});
+	menu->addAction(snap_disable);
+
+	return menu;
+}
+
 shared_ptr<Cursor> Cursor::get_other_cursor() const
 {
 	const shared_ptr<CursorPair> cursors(view_.cursors());