From 8c9f62a5ef14648c9dc46a87c978dece01284d25 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Sun, 21 Oct 2018 22:12:19 +0200 Subject: [PATCH] Make change performed in 79b53a1ae actually work ViewWidget::mouse_down_point_ indeed should contain the position of the last mouse click but since we ignore right clicks, it doesn't. --- pv/views/trace/viewwidget.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp index d5b949c..73c361f 100644 --- a/pv/views/trace/viewwidget.cpp +++ b/pv/views/trace/viewwidget.cpp @@ -252,17 +252,21 @@ void ViewWidget::mousePressEvent(QMouseEvent *event) { assert(event); - /* Ignore right click events as they will open context menus when + if (event->button() & Qt::LeftButton) { + mouse_down_point_ = event->pos(); + mouse_down_item_ = get_mouse_over_item(event->pos()); + mouse_left_press_event(event); + } + + /* Don't forward right click events as they will open context menus when * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent() * to be triggered upon button release, making mouse_down_item_ * hold the last reference to a view item that might have been deleted * from the context menu, preventing it from being freed as intended. + * TODO Remove this once context menus are handled separately */ - if (event->button() & Qt::LeftButton) { + if (event->button() & Qt::RightButton) mouse_down_point_ = event->pos(); - mouse_down_item_ = get_mouse_over_item(event->pos()); - mouse_left_press_event(event); - } } void ViewWidget::mouseReleaseEvent(QMouseEvent *event) -- 2.30.2