X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=a42becaf366695caeff75440fd4ffff6e6eee18c;hb=e47b69882ca7299041123c664dbcc8b552c5db99;hp=2a732f25daa3f7f16590c8d8e39310e4acc4a295;hpb=6a2cc8dd37f6d128ad7e16b9a7a78bb44d5a5aa5;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 2a732f2..a42beca 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -123,46 +123,6 @@ void Header::paintEvent(QPaintEvent*) painter.end(); } -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 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 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); @@ -238,13 +198,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();