MarginWidget: Moved in mouseReleaseEvent

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

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index e20e7b9f00afe664e72439969b73fe5894b6eca7..d96d3aba66f315bf1483f7b4f3045ce96552a7f6 100644 (file)
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -80,6 +80,38 @@ void MarginWidget::mouse_left_press_event(QMouseEvent *event)
        update();
 }
 
+void MarginWidget::mouse_left_release_event(QMouseEvent *event)
+{
+       assert(event);
+
+       auto items = this->items();
+       const bool ctrl_pressed =
+               QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+       // Unselect everything if control is not pressed
+       const shared_ptr<ViewItem> mouse_over =
+               get_mouse_over_item(event->pos());
+
+       for (auto &i : items)
+               i->drag_release();
+
+       if (dragging_)
+               view_.restack_all_row_items();
+       else
+       {
+               if (!ctrl_pressed) {
+                       for (shared_ptr<ViewItem> i : items)
+                               if (mouse_down_item_ != i)
+                                       i->select(false);
+
+                       if (mouse_down_item_)
+                               show_popup(mouse_down_item_);
+               }
+       }
+
+       dragging_ = false;
+}
+
 void MarginWidget::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
@@ -91,6 +123,15 @@ void MarginWidget::mousePressEvent(QMouseEvent *event)
                mouse_left_press_event(event);
 }
 
+void MarginWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+       assert(event);
+       if (event->button() & Qt::LeftButton)
+               mouse_left_release_event(event);
+
+       mouse_down_item_ = nullptr;
+}
+
 void MarginWidget::leaveEvent(QEvent*)
 {
        mouse_point_ = QPoint(-1, -1);
@@ -108,6 +149,19 @@ void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
                menu->exec(event->globalPos());
 }
 
+void MarginWidget::keyPressEvent(QKeyEvent *e)
+{
+       assert(e);
+
+       if (e->key() == Qt::Key_Delete)
+       {
+               const auto items = this->items();
+               for (auto &i : items)
+                       if (i->selected())
+                               i->delete_pressed();
+       }
+}
+
 void MarginWidget::clear_selection()
 {
        const auto items = this->items();