X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=2f9b140eec8d0f9d1649155166b89f3a0638e5cd;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hp=0d86efd853202b0bf2753c91eff0344e5848478b;hpb=e47b69882ca7299041123c664dbcc8b552c5db99;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 0d86efd8..2f9b140e 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -148,33 +148,12 @@ void Ruler::paintEvent(QPaintEvent*) // Draw the items const vector< shared_ptr > items(view_.time_items()); for (auto &i : items) { - const bool highlight = !dragging_ && + const bool highlight = !item_dragging_ && i->label_rect(r).contains(mouse_point_); i->paint_label(p, r, highlight); } } -void Ruler::mouseMoveEvent(QMouseEvent *e) -{ - mouse_point_ = e->pos(); - - if (!(e->buttons() & Qt::LeftButton)) - return; - - if ((e->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - return; - - // Do the drag - dragging_ = true; - - const QPoint delta = e->pos() - mouse_down_point_; - const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - if (i->dragging()) - i->drag_by(delta); -} - void Ruler::mouseDoubleClickEvent(QMouseEvent *e) { view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());