X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=1204559c5c943d5838a968a1bd0d636c5617dfc1;hp=7688f2b7e1c0262fc12a89e82e2ee6c75b5605d2;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=2543cd4e271ff13898080d011a8fdbc13da77655

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index 7688f2b7..1204559c 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -24,6 +24,8 @@
 #include <QMenu>
 #include <QMouseEvent>
 
+#include <pv/globalsettings.hpp>
+
 #include "ruler.hpp"
 #include "view.hpp"
 
@@ -48,8 +50,8 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&view_, SIGNAL(hover_point_changed(QPoint)),
-		this, SLOT(hover_point_changed(QPoint)));
+	connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)),
+		this, SLOT(on_hover_point_changed(const QWidget*, QPoint)));
 	connect(&view_, SIGNAL(offset_changed()),
 		this, SLOT(invalidate_tick_position_cache()));
 	connect(&view_, SIGNAL(scale_changed()),
@@ -112,7 +114,7 @@ QString Ruler::format_time_with_distance(
 		return pv::util::format_time_minutes(t, precision, sign);
 }
 
-pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x)
+pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const
 {
 	return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
 }
@@ -127,6 +129,16 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	connect(create_marker, SIGNAL(triggered()), this, SLOT(on_createMarker()));
 	menu->addAction(create_marker);
 
+	QAction *const toggle_hover_marker = new QAction(this);
+	connect(toggle_hover_marker, SIGNAL(triggered()), this, SLOT(on_toggleHoverMarker()));
+	menu->addAction(toggle_hover_marker);
+
+	GlobalSettings settings;
+	const bool hover_marker_shown =
+		settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool();
+	toggle_hover_marker->setText(hover_marker_shown ?
+		tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
+
 	menu->popup(event->globalPos());
 }
 
@@ -292,8 +304,9 @@ TickPositions Ruler::calculate_tick_positions(
 	return tp;
 }
 
-void Ruler::hover_point_changed(const QPoint &hp)
+void Ruler::on_hover_point_changed(const QWidget* widget, const QPoint &hp)
 {
+	(void)widget;
 	(void)hp;
 
 	update();
@@ -306,7 +319,14 @@ void Ruler::invalidate_tick_position_cache()
 
 void Ruler::on_createMarker()
 {
-	view_.add_flag(get_time_from_x_pos(context_menu_x_pos_));
+	view_.add_flag(get_time_from_x_pos(mouse_down_point_.x()));
+}
+
+void Ruler::on_toggleHoverMarker()
+{
+	GlobalSettings settings;
+	const bool state = settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool();
+	settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, !state);
 }
 
 } // namespace trace