Header: Moved drag functionality into SelectableItem

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index cda0848984a8cbf3d3ae144b5dc139703e929c5c..b9261f9753d060bdaffbb48ab7c52a35d4a5210b 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -123,12 +123,11 @@ void Header::paintEvent(QPaintEvent*)
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
-       const bool dragging = !_drag_row_items.empty();
        for (const shared_ptr<RowItem> r : row_items)
        {
                assert(r);
 
-               const bool highlight = !dragging &&
+               const bool highlight = !_dragging &&
                        r->label_rect(w).contains(_mouse_point);
                r->paint_label(painter, w, highlight);
        }
@@ -136,70 +135,79 @@ void Header::paintEvent(QPaintEvent*)
        painter.end();
 }
 
+void Header::mouseLeftPressEvent(QMouseEvent *event)
+{
+       const bool ctrl_pressed =
+               QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+       // Clear selection if control is not pressed and this item is unselected
+       const shared_ptr<RowItem> mouse_over =
+               get_mouse_over_row_item(event->pos());
+       if (!ctrl_pressed && (!mouse_over || !mouse_over->selected()))
+               for (shared_ptr<RowItem> r : _view)
+                       r->select(false);
+
+       // Set the signal selection state if the item has been clicked
+       if (mouse_over) {
+               if (ctrl_pressed)
+                       mouse_over->select(!mouse_over->selected());
+               else
+                       mouse_over->select(true);
+       }
+
+       // Save the offsets of any signals which will be dragged
+       _mouse_down_point = event->pos();
+       for (const shared_ptr<RowItem> r : _view)
+               if (r->selected())
+                       r->drag();
+
+       selection_changed();
+       update();
+}
+
 void Header::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
+       if (event->button() & Qt::LeftButton)
+               mouseLeftPressEvent(event);
+}
 
-       if (event->button() & Qt::LeftButton) {
-               _mouse_down_point = event->pos();
+void Header::mouseLeftReleaseEvent(QMouseEvent *event)
+{
+       assert(event);
 
-               // Save the offsets of any signals which will be dragged
-               for (const shared_ptr<RowItem> r : _view)
-                       if (r->selected())
-                               _drag_row_items.push_back(
-                                       make_pair(r, r->v_offset()));
-       }
+       const bool ctrl_pressed =
+               QApplication::keyboardModifiers() & Qt::ControlModifier;
 
-       // Select the signal if it has been clicked
-       const shared_ptr<RowItem> mouse_over_row_item =
+       // Unselect everything if control is not pressed
+       const shared_ptr<RowItem> mouse_over =
                get_mouse_over_row_item(event->pos());
-       if (mouse_over_row_item) {
-               if (mouse_over_row_item->selected())
-                       mouse_over_row_item->select(false);
-               else {
-                       mouse_over_row_item->select(true);
-
-                       if (~QApplication::keyboardModifiers() &
-                               Qt::ControlModifier)
-                               _drag_row_items.clear();
-
-                       // Add the signal to the drag list
-                       if (event->button() & Qt::LeftButton)
-                               _drag_row_items.push_back(
-                                       make_pair(mouse_over_row_item,
-                                       mouse_over_row_item->v_offset()));
-               }
-       }
 
-       if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
-               // Unselect all other signals because the Ctrl is not
-               // pressed
-               for (const shared_ptr<RowItem> r : _view)
-                       if (r != mouse_over_row_item)
-                               r->select(false);
+       for (auto &r : _view)
+               r->drag_release();
+
+       if (_dragging)
+               _view.normalize_layout();
+       else
+       {
+               if (!ctrl_pressed) {
+                       for (shared_ptr<RowItem> r : _view)
+                               if (mouse_over != r)
+                                       r->select(false);
+
+                       if (mouse_over)
+                               show_popup(mouse_over);
+               }
        }
 
-       selection_changed();
-       update();
+       _dragging = false;
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
        assert(event);
-       if (event->button() == Qt::LeftButton) {
-               if (_dragging)
-                       _view.normalize_layout();
-               else
-               {
-                       const shared_ptr<RowItem> mouse_over_row_item =
-                               get_mouse_over_row_item(event->pos());
-                       if (mouse_over_row_item)
-                               show_popup(mouse_over_row_item);
-               }
-
-               _dragging = false;
-               _drag_row_items.clear();
-       }
+       if (event->button() & Qt::LeftButton)
+               mouseLeftReleaseEvent(event);
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
@@ -214,32 +222,33 @@ void Header::mouseMoveEvent(QMouseEvent *event)
                QApplication::startDragDistance())
                return;
 
-       // Move the signals if we are dragging
-       if (!_drag_row_items.empty())
-       {
-               _dragging = true;
-
-               const int delta = event->pos().y() - _mouse_down_point.y();
-
-               for (auto i = _drag_row_items.begin();
-                       i != _drag_row_items.end(); i++) {
-                       const std::shared_ptr<RowItem> row_item((*i).first);
-                       if (row_item) {
-                               const int y = (*i).second + delta;
-                               const int y_snap =
-                                       ((y + View::SignalSnapGridSize / 2) /
-                                               View::SignalSnapGridSize) *
-                                               View::SignalSnapGridSize;
-                               row_item->set_v_offset(y_snap);
-
-                               // Ensure the trace is selected
-                               row_item->select();
-                       }
-                       
+       // Check all the drag items share a common owner
+       RowItemOwner *item_owner = nullptr;
+       for (shared_ptr<RowItem> r : _view)
+               if (r->dragging()) {
+                       if (!item_owner)
+                               item_owner = r->owner();
+                       else if(item_owner != r->owner())
+                               return;
                }
 
-               signals_moved();
-       }
+       if (!item_owner)
+               return;
+
+       // Do the drag
+       _dragging = true;
+
+       const int delta = event->pos().y() - _mouse_down_point.y();
+
+       for (std::shared_ptr<RowItem> r : _view)
+               if (r->dragging()) {
+                       r->set_v_offset(r->drag_point().y() + delta);
+
+                       // Ensure the trace is selected
+                       r->select();
+               }
+
+       signals_moved();
 
        update();
 }