X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=859f6fdef4e129336b23cc038cddf6e31b107e73;hp=8432a24b47cfba4fb8ce692ff075925161d7912f;hb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6;hpb=0f95449910ba4022c2f14196163e77cff9620987;ds=sidebyside diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index 8432a24b..859f6fde 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -142,9 +142,10 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect) } } -void CursorPair::draw_viewport_background(QPainter &p, - const QRect &rect) -{ +void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) { + if (!enabled()) + return; + p.setPen(Qt::NoPen); p.setBrush(QBrush(View::CursorAreaColour)); @@ -152,19 +153,9 @@ void CursorPair::draw_viewport_background(QPainter &p, const int l = (int)max(min( offsets.first, offsets.second), 0.0f); const int r = (int)min(max( - offsets.first, offsets.second), (float)rect.width()); - - p.drawRect(l, 0, r - l, rect.height()); -} - -void CursorPair::draw_viewport_foreground(QPainter &p, - const QRect &rect) -{ - assert(first_); - assert(second_); + offsets.first, offsets.second), (float)pp.width()); - first_->paint(p, rect); - second_->paint(p, rect); + p.drawRect(l, pp.top(), r - l, pp.height()); } void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)