X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=007a8c218878fa14cf0477322b7557296a990a14;hb=e71eb81c946c3524e01eaef9781ccbf170143d0c;hp=d555a792ed5f1ad8a09093709919c1c25c75e48d;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b;p=pulseview.git diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index d555a792..007a8c21 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -148,12 +148,12 @@ bool Viewport::touch_event(QTouchEvent *event) void Viewport::paintEvent(QPaintEvent*) { - vector< shared_ptr > row_items(view_.begin(), view_.end()); + vector< shared_ptr > row_items(view_.begin(), view_.end()); 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->visual_v_offset() < b->visual_v_offset(); }); const vector< shared_ptr > time_items(view_.time_items()); @@ -167,15 +167,17 @@ void Viewport::paintEvent(QPaintEvent*) for (const shared_ptr t : time_items) t->paint_back(p, pp); - for (const shared_ptr r : row_items) + for (const shared_ptr r : row_items) r->paint_back(p, pp); for (const shared_ptr t : time_items) t->paint_mid(p, pp); - for (const shared_ptr r : row_items) + for (const shared_ptr r : row_items) r->paint_mid(p, pp); - for (const shared_ptr r : row_items) + p.setRenderHint(QPainter::Antialiasing, false); + + for (const shared_ptr r : row_items) r->paint_fore(p, pp); for (const shared_ptr t : time_items) t->paint_fore(p, pp);