MarginWidget: Moved in mousePressEvent

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

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index 2ef262762cc0c13a7683b0aa7379099e3fca2502..e20e7b9f00afe664e72439969b73fe5894b6eca7 100644 (file)
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
 
@@ -49,6 +50,47 @@ void MarginWidget::show_popup(const shared_ptr<ViewItem> &item)
                p->show();
 }
 
+void MarginWidget::mouse_left_press_event(QMouseEvent *event)
+{
+       (void)event;
+
+       const bool ctrl_pressed =
+               QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+       // Clear selection if control is not pressed and this item is unselected
+       if ((!mouse_down_item_ || !mouse_down_item_->selected()) &&
+               !ctrl_pressed)
+               clear_selection();
+
+       // Set the signal selection state if the item has been clicked
+       if (mouse_down_item_) {
+               if (ctrl_pressed)
+                       mouse_down_item_->select(!mouse_down_item_->selected());
+               else
+                       mouse_down_item_->select(true);
+       }
+
+       // Save the offsets of any signals which will be dragged
+       const auto items = this->items();
+       for (auto &i : items)
+               if (i->selected())
+                       i->drag();
+
+       selection_changed();
+       update();
+}
+
+void MarginWidget::mousePressEvent(QMouseEvent *event)
+{
+       assert(event);
+
+       mouse_down_point_ = event->pos();
+       mouse_down_item_ = get_mouse_over_item(event->pos());
+
+       if (event->button() & Qt::LeftButton)
+               mouse_left_press_event(event);
+}
+
 void MarginWidget::leaveEvent(QEvent*)
 {
        mouse_point_ = QPoint(-1, -1);