X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=e2b2d17295f3295bc429f550548d95545c3ca1f3;hb=1f1edc092680e9182be07a760ad03d00b8c5ca06;hp=0b3b2fd1e233f962bc9f6b50417109e72582722b;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f;p=pulseview.git diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp index 0b3b2fd..e2b2d17 100644 --- a/pv/view/viewwidget.cpp +++ b/pv/view/viewwidget.cpp @@ -35,7 +35,7 @@ namespace view { ViewWidget::ViewWidget(View &parent) : QWidget(&parent), view_(parent), - dragging_(false) + item_dragging_(false) { setFocusPolicy(Qt::ClickFocus); setMouseTracking(true); @@ -86,6 +86,12 @@ bool ViewWidget::accept_drag() const return false; } +bool ViewWidget::mouse_down() const +{ + return mouse_down_point_.x() != INT_MIN && + mouse_down_point_.y() != INT_MIN; +} + void ViewWidget::drag_items(const QPoint &delta) { // Drag the row items @@ -157,7 +163,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event) for (auto &i : items) i->drag_release(); - if (dragging_) + if (item_dragging_) view_.restack_all_row_items(); else { @@ -171,7 +177,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event) } } - dragging_ = false; + item_dragging_ = false; } void ViewWidget::mousePressEvent(QMouseEvent *event) @@ -191,6 +197,7 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event) if (event->button() & Qt::LeftButton) mouse_left_release_event(event); + mouse_down_point_ = QPoint(INT_MIN, INT_MIN); mouse_down_item_ = nullptr; } @@ -210,7 +217,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event) return; // Do the drag - dragging_ = true; + item_dragging_ = true; drag_items(event->pos() - mouse_down_point_); update();