Added ViewWidget as a common ancestor of all view widgets

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

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index 5a81c45933450b40e5aee63d36116b75eeba6b8b..fcbb31bf0174bb1944286005b11d0d978d715126 100644 (file)
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -34,8 +34,7 @@ namespace pv {
 namespace view {
 
 MarginWidget::MarginWidget(View &parent) :
 namespace view {
 
 MarginWidget::MarginWidget(View &parent) :

-       QWidget(&parent),
-       view_(parent),
+       ViewWidget(parent),

        dragging_(false)
 {
        setAttribute(Qt::WA_NoSystemBackground, true);
        dragging_(false)
 {
        setAttribute(Qt::WA_NoSystemBackground, true);


@@ -80,6 +79,38 @@ void MarginWidget::mouse_left_press_event(QMouseEvent *event)
        update();
 }
 
        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);
 void MarginWidget::mousePressEvent(QMouseEvent *event)
 {
        assert(event);


@@ -91,6 +122,37 @@ void MarginWidget::mousePressEvent(QMouseEvent *event)
                mouse_left_press_event(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::mouseMoveEvent(QMouseEvent *event)
+{
+       assert(event);
+       mouse_point_ = event->pos();
+
+       if (!(event->buttons() & Qt::LeftButton))
+               return;
+
+       if ((event->pos() - mouse_down_point_).manhattanLength() <
+               QApplication::startDragDistance())
+               return;
+
+       if (!accept_drag())
+               return;
+
+       // Do the drag
+       dragging_ = true;
+       drag_items(event->pos() - mouse_down_point_);
+
+       update();
+}
+

 void MarginWidget::leaveEvent(QEvent*)
 {
        mouse_point_ = QPoint(-1, -1);
 void MarginWidget::leaveEvent(QEvent*)
 {
        mouse_point_ = QPoint(-1, -1);