X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=5df658dbf31cdff74cc9f789552634d75db50dc0;hb=115a522abb9dc4071f62a3df77b9501e1f9ff722;hp=a14f458bedd96710304cb06ad262944e5a91278d;hpb=49028d6c2d8aaf61b528e2dfb7ad3fe1ccb7169e;p=pulseview.git diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index a14f458..5df658d 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -36,6 +36,7 @@ namespace pv { namespace view { const int CursorPair::DeltaPadding = 8; +const QColor CursorPair::ViewportFillColour(220, 231, 243); CursorPair::CursorPair(View &view) : TimeItem(view), @@ -83,9 +84,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent) QRectF CursorPair::label_rect(const QRectF &rect) const { - const QSizeF label_size( - text_size_.width() + View::LabelPadding.width() * 2, - text_size_.height() + View::LabelPadding.height() * 2); + const QSizeF label_size(text_size_ + LabelPadding * 2); const pair offsets(get_cursor_offsets()); const pair normal_offsets( (offsets.first < offsets.second) ? offsets : @@ -97,7 +96,7 @@ QRectF CursorPair::label_rect(const QRectF &rect) const (float)rect.width() + height); return QRectF(left, rect.height() - label_size.height() - - TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f, + TimeMarker::ArrowSize - 0.5f, right - left, height); } @@ -150,7 +149,7 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) { return; p.setPen(Qt::NoPen); - p.setBrush(QBrush(View::CursorAreaColour)); + p.setBrush(QBrush(ViewportFillColour)); const pair offsets(get_cursor_offsets()); const int l = (int)max(min(