X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewwidget.cpp;h=5a85c15d5c52d25e29aeff47e1af3e70dc0ec60d;hb=20c99cfc69d3c7430817abd9a1f810698deb4a18;hp=d46182e449e67d5f3d0e7a71a063fb746a948144;hpb=710c2a1896fbac968c82f2d1257aaabd10a48cc8;p=pulseview.git

diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp
index d46182e4..5a85c15d 100644
--- a/pv/views/trace/viewwidget.cpp
+++ b/pv/views/trace/viewwidget.cpp
@@ -287,7 +287,7 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 void ViewWidget::keyReleaseEvent(QKeyEvent *event)
 {
 	// Update mouse_modifiers_ also if modifiers change, but pointer doesn't move
-	if (mouse_point_.x() >= 0 && mouse_point_.y() >= 0) // mouse is inside
+	if ((mouse_point_.x() >= 0) && (mouse_point_.y() >= 0)) // mouse is inside
 		mouse_modifiers_ = event->modifiers();
 	update();
 }
@@ -295,7 +295,7 @@ void ViewWidget::keyReleaseEvent(QKeyEvent *event)
 void ViewWidget::keyPressEvent(QKeyEvent *event)
 {
 	// Update mouse_modifiers_ also if modifiers change, but pointer doesn't move
-	if (mouse_point_.x() >= 0 && mouse_point_.y() >= 0) // mouse is inside
+	if ((mouse_point_.x() >= 0) && (mouse_point_.y() >= 0)) // mouse is inside
 		mouse_modifiers_ = event->modifiers();
 	update();
 }
@@ -339,13 +339,25 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event)
 			drag_items(event->pos() - mouse_down_point_);
 		}
 	}
+
+	// Force a repaint of the widget to update highlighted parts
+	update();
 }
 
 void ViewWidget::leaveEvent(QEvent*)
 {
-	mouse_point_ = QPoint(-1, -1);
+	bool cursor_above_widget = rect().contains(mapFromGlobal(QCursor::pos()));
+
+	// We receive leaveEvent also when the widget loses focus even when
+	// the mouse cursor hasn't moved at all - e.g. when the popup shows.
+	// However, we don't want to reset mouse_position_ when the mouse is
+	// still above this widget as doing so would break the context menu
+	if (!cursor_above_widget)
+		mouse_point_ = QPoint(INT_MIN, INT_MIN);
+
 	mouse_modifiers_ = Qt::NoModifier;
 	item_hover(nullptr, QPoint());
+
 	update();
 }