X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=c3753e6560707cbeacd132e4b94140a7a9455c28;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hp=c5a1bc9923beafb00c805eff8f331735a764bbdf;hpb=f106fc3a2d824745744d5c96039966434d56af64;p=pulseview.git diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index c5a1bc9..c3753e6 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), @@ -84,8 +85,8 @@ 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); + text_size_.width() + LabelPadding.width() * 2, + text_size_.height() + LabelPadding.height() * 2); const pair offsets(get_cursor_offsets()); const pair normal_offsets( (offsets.first < offsets.second) ? offsets : @@ -97,11 +98,11 @@ 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); } -void CursorPair::paint_label(QPainter &p, const QRect &rect) +void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover) { assert(first_); assert(second_); @@ -130,7 +131,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect) p.drawRoundedRect(delta_rect, radius, radius); } - p.setBrush(Cursor::FillColour); + p.setBrush(hover ? Cursor::FillColour.lighter() : + Cursor::FillColour); p.setPen(Cursor::FillColour.darker()); p.drawRoundedRect(delta_rect, radius, radius); @@ -149,7 +151,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(