MarginWidget: Moved in mouseReleaseEvent

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 04e4c764845ce80c64ab6ac8bf9f0fb8ec935f58..a42becaf366695caeff75440fd4ffff6e6eee18c 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,12 @@ QSize Header::extended_size_hint() const
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+vector< shared_ptr<ViewItem> > Header::items()
+{
+       return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+}
+
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
@@ -89,13 +94,6 @@ shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
        return shared_ptr<RowItem>();
 }
 
-void Header::clear_selection()
-{
-       for (auto &i : view_)
-               i->select(false);
-       update();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
        // The trace labels are not drawn with the arrows exactly on the
@@ -125,87 +123,6 @@ void Header::paintEvent(QPaintEvent*)
        painter.end();
 }
 
-void Header::mouseLeftPressEvent(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)
-               for (shared_ptr<RowItem> r : view_)
-                       r->select(false);
-
-       // 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
-       for (const shared_ptr<RowItem> r : view_)
-               if (r->selected())
-                       r->drag();
-
-       selection_changed();
-       update();
-}
-
-void Header::mousePressEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       mouse_down_point_ = event->pos();
-       mouse_down_item_ = get_mouse_over_item(event->pos());
-
-       if (event->button() & Qt::LeftButton)
-               mouseLeftPressEvent(event);
-}
-
-void Header::mouseLeftReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       const bool ctrl_pressed =
-               QApplication::keyboardModifiers() & Qt::ControlModifier;
-
-       // Unselect everything if control is not pressed
-       const shared_ptr<RowItem> mouse_over =
-               get_mouse_over_item(event->pos());
-
-       for (auto &r : view_)
-               r->drag_release();
-
-       if (dragging_)
-               view_.restack_all_row_items();
-       else
-       {
-               if (!ctrl_pressed) {
-                       for (shared_ptr<RowItem> r : view_)
-                               if (mouse_down_item_ != r)
-                                       r->select(false);
-
-                       if (mouse_down_item_)
-                               show_popup(mouse_down_item_);
-               }
-       }
-
-       dragging_ = false;
-}
-
-void Header::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-       if (event->button() & Qt::LeftButton)
-               mouseLeftReleaseEvent(event);
-
-       mouse_down_item_ = nullptr;
-}
-
 void Header::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
@@ -254,7 +171,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-       const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
+       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
        if (!r)
                return;
 
@@ -281,13 +198,9 @@ void Header::keyPressEvent(QKeyEvent *e)
 {
        assert(e);
 
-       if (e->key() == Qt::Key_Delete)
-       {
-               for (const shared_ptr<RowItem> r : view_)
-                       if (r->selected())
-                               r->delete_pressed();
-       }
-       else if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+       MarginWidget::keyPressEvent(e);
+
+       if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
                on_group();
        else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
                on_ungroup();