X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=600dd621a20b6073b09f45552e86ffd0b3a89ab8;hp=a5174bb37ecd000332a199cea5790a7792e83770;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=282905348863fe871a48c680bd12bc1dee364a43 diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp index a5174bb3..600dd621 100644 --- a/pv/view/viewwidget.cpp +++ b/pv/view/viewwidget.cpp @@ -51,6 +51,11 @@ void ViewWidget::clear_selection() update(); } +void ViewWidget::item_hover(const shared_ptr &item) +{ + (void)item; +} + void ViewWidget::item_clicked(const shared_ptr &item) { (void)item; @@ -74,7 +79,7 @@ bool ViewWidget::accept_drag() const if (r->dragging()) { if (!item_owner) item_owner = r->owner(); - else if(item_owner != r->owner()) + else if (item_owner != r->owner()) return false; } @@ -256,26 +261,32 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event) mouse_down_item_ = nullptr; } -void ViewWidget::mouseMoveEvent(QMouseEvent *event) +void ViewWidget::mouseMoveEvent(QMouseEvent *e) { - assert(event); - mouse_point_ = event->pos(); + assert(e); + mouse_point_ = e->pos(); - if (!(event->buttons() & Qt::LeftButton)) - return; + if (!e->buttons()) + item_hover(get_mouse_over_item(e->pos())); + else if (e->buttons() & Qt::LeftButton) + { + if (!item_dragging_) + { + if ((e->pos() - mouse_down_point_).manhattanLength() < + QApplication::startDragDistance()) + return; - if ((event->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - return; + if (!accept_drag()) + return; - if (!accept_drag()) - return; + item_dragging_ = true; + } - // Do the drag - item_dragging_ = true; - drag_items(event->pos() - mouse_down_point_); + // Do the drag + drag_items(e->pos() - mouse_down_point_); - update(); + update(); + } } void ViewWidget::leaveEvent(QEvent*)