X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=57053298d00a81d0495f2ce290a5aa3cdea77ac8;hp=0b3b2fd1e233f962bc9f6b50417109e72582722b;hb=803cdac41caf71af9298e3f612468aa522a107d5;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp index 0b3b2fd1..57053298 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); @@ -157,7 +157,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 +171,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event) } } - dragging_ = false; + item_dragging_ = false; } void ViewWidget::mousePressEvent(QMouseEvent *event) @@ -210,7 +210,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event) return; // Do the drag - dragging_ = true; + item_dragging_ = true; drag_items(event->pos() - mouse_down_point_); update();