X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fmarginwidget.cpp;h=7e4fcdfa76aed109e0e8bfb6cb2032f6690bbdb6;hp=2ef262762cc0c13a7683b0aa7379099e3fca2502;hb=0aa57689a8abc7eb313de50774b8d0cf271bc61f;hpb=5a6a4ce3e32a250cd586f4755573ed3bed530d7b diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp index 2ef26276..7e4fcdfa 100644 --- a/pv/view/marginwidget.cpp +++ b/pv/view/marginwidget.cpp @@ -33,13 +33,15 @@ namespace pv { namespace view { MarginWidget::MarginWidget(View &parent) : - QWidget(&parent), - view_(parent), - dragging_(false) + ViewWidget(parent) { setAttribute(Qt::WA_NoSystemBackground, true); - setFocusPolicy(Qt::ClickFocus); - setMouseTracking(true); +} + +void MarginWidget::item_clicked(const shared_ptr &item) +{ + if (item && item->enabled()) + show_popup(item); } void MarginWidget::show_popup(const shared_ptr &item) @@ -49,12 +51,6 @@ void MarginWidget::show_popup(const shared_ptr &item) p->show(); } -void MarginWidget::leaveEvent(QEvent*) -{ - mouse_point_ = QPoint(-1, -1); - update(); -} - void MarginWidget::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr r = get_mouse_over_item(mouse_point_); @@ -66,12 +62,16 @@ void MarginWidget::contextMenuEvent(QContextMenuEvent *event) menu->exec(event->globalPos()); } -void MarginWidget::clear_selection() +void MarginWidget::keyPressEvent(QKeyEvent *event) { - const auto items = this->items(); - for (auto &i : items) - i->select(false); - update(); + assert(event); + + if (event->key() == Qt::Key_Delete) { + const auto items = this->items(); + for (auto &i : items) + if (i->selected()) + i->delete_pressed(); + } } } // namespace view