X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=83ffed281b5f6768085d1a03ee77f2840a443487;hb=4b018bf1eeed0f7b80120d41d7881673a2f29e61;hp=bebf529147da67f5bc4d591255bce144d5d1674b;hpb=e4e951b7fcfa4c6bf36547d0106bfa730fceb92c;p=pulseview.git

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index bebf5291..83ffed28 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -158,6 +158,12 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	connect(set_zero_position, SIGNAL(triggered()), this, SLOT(on_setZeroPosition()));
 	menu->addAction(set_zero_position);
 
+	if (view_.zero_offset().convert_to<double>() != 0) {
+		QAction *const reset_zero_position = new QAction(tr("Reset zero point"), this);
+		connect(reset_zero_position, SIGNAL(triggered()), this, SLOT(on_resetZeroPosition()));
+		menu->addAction(reset_zero_position);
+	}
+
 	QAction *const toggle_hover_marker = new QAction(this);
 	connect(toggle_hover_marker, SIGNAL(triggered()), this, SLOT(on_toggleHoverMarker()));
 	menu->addAction(toggle_hover_marker);
@@ -277,7 +283,7 @@ void Ruler::paintEvent(QPaintEvent*)
 		const int rightedge = width();
 		const int x_tick = tick.first;
 		if ((x_tick > leftedge) && (x_tick < rightedge)) {
-			const int x_left_bound = QFontMetrics(font()).width(tick.second) / 2;
+			const int x_left_bound = util::text_width(QFontMetrics(font()), tick.second) / 2;
 			const int x_right_bound = rightedge - x_left_bound;
 			const int x_legend = min(max(x_tick, x_left_bound), x_right_bound);
 			p.drawText(x_legend, ValueMargin, 0, text_height,
@@ -397,6 +403,11 @@ void Ruler::on_setZeroPosition()
 	view_.set_zero_position(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
+void Ruler::on_resetZeroPosition()
+{
+	view_.reset_zero_position();
+}
+
 void Ruler::on_toggleHoverMarker()
 {
 	GlobalSettings settings;