X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=766347d5272a09962de138584a57e97cbf479ffa;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hp=1cbe59cec4133711f9287d8c55de7a5caba1335d;hpb=5a6a4ce3e32a250cd586f4755573ed3bed530d7b;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 1cbe59ce..766347d5 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -123,47 +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 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 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); @@ -279,13 +238,9 @@ void Header::keyPressEvent(QKeyEvent *e) { assert(e); - if (e->key() == Qt::Key_Delete) - { - for (const shared_ptr 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();