X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=26aae49fada6f9a5a7d2d533ad77b2c8e017baaa;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hp=a42becaf366695caeff75440fd4ffff6e6eee18c;hpb=e47b69882ca7299041123c664dbcc8b552c5db99;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index a42becaf..26aae49f 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -62,8 +62,6 @@ static bool item_selected(shared_ptr r) Header::Header(View &parent) : MarginWidget(parent) { - connect(&view_, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); } QSize Header::sizeHint() const @@ -115,7 +113,7 @@ void Header::paintEvent(QPaintEvent*) { assert(r); - const bool highlight = !dragging_ && + const bool highlight = !item_dragging_ && r->label_rect(rect).contains(mouse_point_); r->paint_label(painter, rect, highlight); } @@ -123,52 +121,6 @@ void Header::paintEvent(QPaintEvent*) painter.end(); } -void Header::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); - mouse_point_ = event->pos(); - - if (!(event->buttons() & Qt::LeftButton)) - return; - - if ((event->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - return; - - // Check all the drag items share a common owner - RowItemOwner *item_owner = nullptr; - for (shared_ptr r : view_) - if (r->dragging()) { - if (!item_owner) - item_owner = r->owner(); - else if(item_owner != r->owner()) - return; - } - - if (!item_owner) - return; - - // Do the drag - dragging_ = true; - - const QPoint delta = event->pos() - mouse_down_point_; - - for (std::shared_ptr r : view_) - if (r->dragging()) { - r->drag_by(delta); - - // Ensure the trace is selected - r->select(); - } - - item_owner->restack_items(); - for (const auto &r : *item_owner) - r->animate_to_layout_v_offset(); - signals_moved(); - - update(); -} - void Header::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr r = get_mouse_over_item(mouse_point_); @@ -206,11 +158,6 @@ void Header::keyPressEvent(QKeyEvent *e) on_ungroup(); } -void Header::on_signals_moved() -{ - update(); -} - void Header::on_group() { vector< shared_ptr > selected_items(