Make change performed in 79b53a1ae actually work

[pulseview.git] / pv / views / trace / viewwidget.cpp

diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp
index c3461614ab637db740659666482d6b12ee24445c..73c361f47d802dd469b8ad59f9a2f4e47f285060 100644 (file)
--- a/pv/views/trace/viewwidget.cpp
+++ b/pv/views/trace/viewwidget.cpp
@@ -77,7 +77,7 @@ bool ViewWidget::accept_drag() const
        if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
                TraceTreeItemOwner *item_owner = nullptr;
        if (any_row_items_selected && !any_time_items_selected) {
                // Check all the drag items share a common owner
                TraceTreeItemOwner *item_owner = nullptr;

-               for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+               for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)

                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();
                        if (r->dragging()) {
                                if (!item_owner)
                                        item_owner = r->owner();


@@ -107,7 +107,7 @@ void ViewWidget::drag_items(const QPoint &delta)
        // Drag the row items
        const vector< shared_ptr<RowItem> > row_items(
                view_.list_by_type<RowItem>());
        // Drag the row items
        const vector< shared_ptr<RowItem> > row_items(
                view_.list_by_type<RowItem>());

-       for (shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<RowItem>& r : row_items)

                if (r->dragging()) {
                        r->drag_by(delta);
 
                if (r->dragging()) {
                        r->drag_by(delta);
 


@@ -121,7 +121,7 @@ void ViewWidget::drag_items(const QPoint &delta)
        TraceTreeItemOwner *item_owner = nullptr;
        const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
                view_.list_by_type<TraceTreeItem>());
        TraceTreeItemOwner *item_owner = nullptr;
        const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
                view_.list_by_type<TraceTreeItem>());

-       for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+       for (const shared_ptr<TraceTreeItem>& i : trace_tree_items)

                if (i->dragging())
                        item_owner = i->owner();
 
                if (i->dragging())
                        item_owner = i->owner();
 


@@ -252,17 +252,21 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
        assert(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.
         * 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_point_ = event->pos();

-               mouse_down_item_ = get_mouse_over_item(event->pos());
-               mouse_left_press_event(event);
-       }

 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)