X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewport.cpp;h=e5fb607639eac3b6ae7a2985c1c7735988c16f40;hp=8eb32a5e94f03d11254a87e7eae5b14f714c4810;hb=fb64180193664005567570724d52b685913e15ed;hpb=20f59e957e70250cfb876ac7a1743134d6b83339 diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp index 8eb32a5e..e5fb6076 100644 --- a/pv/views/trace/viewport.cpp +++ b/pv/views/trace/viewport.cpp @@ -64,9 +64,9 @@ shared_ptr Viewport::get_mouse_over_item(const QPoint &pt) return nullptr; } -void Viewport::item_hover(const shared_ptr &item) +void Viewport::item_hover(const shared_ptr &item, QPoint pos) { - if (item && item->is_draggable()) + if (item && item->is_draggable(pos)) setCursor(dynamic_pointer_cast(item) ? Qt::SizeVerCursor : Qt::SizeHorCursor); else @@ -165,7 +165,7 @@ void Viewport::paintEvent(QPaintEvent*) stable_sort(row_items.begin(), row_items.end(), [](const shared_ptr &a, const shared_ptr &b) { - return a->point(QRect()).y() < b->point(QRect()).y(); }); + return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); }); const vector< shared_ptr > time_items(view_.time_items()); assert(none_of(time_items.begin(), time_items.end(),