X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=8e7e0b676d435c26d05e6dca9f1cfea142a6c469;hp=6e74ddd0a29a272b2d1661b64d2054949767f040;hb=fe68068b2f8f3ae69b762636e91de91e8996aa11;hpb=e23567ed84aa55e2a0c48252080058186f6b80e7

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index 6e74ddd..8e7e0b6 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -114,13 +114,24 @@ 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) const
+pv::util::Timestamp Ruler::get_absolute_time_from_x_pos(uint32_t x) const
+{
+	return view_.offset() + ((double)x + 0.5) * view_.scale();
+}
+
+pv::util::Timestamp Ruler::get_ruler_time_from_x_pos(uint32_t x) const
 {
 	return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
 }
 
 void Ruler::contextMenuEvent(QContextMenuEvent *event)
 {
+	MarginWidget::contextMenuEvent(event);
+
+	// Don't show a context menu if the MarginWidget found a widget that shows one
+	if (event->isAccepted())
+		return;
+
 	context_menu_x_pos_ = event->pos().x();
 
 	QMenu *const menu = new QMenu(this);
@@ -143,6 +154,7 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	toggle_hover_marker->setText(hover_marker_shown ?
 		tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
 
+	event->setAccepted(true);
 	menu->popup(event->globalPos());
 }
 
@@ -170,7 +182,7 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 
 void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-	view_.add_flag(get_time_from_x_pos(event->x()));
+	view_.add_flag(get_ruler_time_from_x_pos(event->x()));
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -323,12 +335,12 @@ void Ruler::invalidate_tick_position_cache()
 
 void Ruler::on_createMarker()
 {
-	view_.add_flag(get_time_from_x_pos(mouse_down_point_.x()));
+	view_.add_flag(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_setZeroPosition()
 {
-	view_.set_zero_position(get_time_from_x_pos(mouse_down_point_.x()));
+	view_.set_zero_position(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_toggleHoverMarker()