X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewport.cpp;h=85db5250a385766d9b1cf4611e1f055449e2dc30;hb=93dbad3ed4954c3e0c140c26e867bda219cd683f;hp=2ca43a0b182da5fb6d9a3690faae7725055a55a7;hpb=f0b992572e7e06a1f62ede8f1bf8d9b0ad8896bc;p=pulseview.git diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp index 2ca43a0b..85db5250 100644 --- a/pv/views/trace/viewport.cpp +++ b/pv/views/trace/viewport.cpp @@ -69,8 +69,8 @@ shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) void Viewport::item_hover(const shared_ptr &item, QPoint pos) { if (item && item->is_draggable(pos)) - setCursor(dynamic_pointer_cast(item) ? - Qt::SizeVerCursor : Qt::SizeHorCursor); + setCursor(dynamic_pointer_cast(item) ? + Qt::SizeHorCursor : Qt::SizeVerCursor); else unsetCursor(); } @@ -161,12 +161,12 @@ void Viewport::paintEvent(QPaintEvent*) &ViewItem::paint_back, &ViewItem::paint_mid, &ViewItem::paint_fore, nullptr}; - vector< shared_ptr > row_items(view_.list_by_type()); + vector< shared_ptr > row_items(view_.list_by_type()); assert(none_of(row_items.begin(), row_items.end(), - [](const shared_ptr &r) { return !r; })); + [](const shared_ptr &r) { return !r; })); stable_sort(row_items.begin(), row_items.end(), - [](const shared_ptr &a, const shared_ptr &b) { + [](const shared_ptr &a, const shared_ptr &b) { return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); }); const vector< shared_ptr > time_items(view_.time_items()); @@ -187,7 +187,7 @@ void Viewport::paintEvent(QPaintEvent*) (t.get()->*(*paint_func))(p, time_pp); ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset()); - for (const shared_ptr& r : row_items) + for (const shared_ptr& r : row_items) (r.get()->*(*paint_func))(p, row_pp); }