namespace view {
const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
CursorPair::CursorPair(View &view) :
TimeItem(view),
return (first_->get_x() + second_->get_x()) / 2.0f;
}
-QPoint CursorPair::point() const
+QPoint CursorPair::point(const QRect &rect) const
{
- return first_->point();
+ return first_->point(rect);
}
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<float, float> offsets(get_cursor_offsets());
const pair<float, float> normal_offsets(
(offsets.first < offsets.second) ? offsets :
(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_);
return;
const unsigned int prefix = view_.tick_prefix();
+ const QColor text_colour =
+ ViewItem::select_text_colour(Cursor::FillColour);
+ p.setPen(text_colour);
compute_text_size(p, prefix);
QRectF delta_rect(label_rect(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);
p.setPen(Cursor::FillColour.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(ViewItem::select_text_colour(
- Cursor::FillColour));
+ p.setPen(text_colour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
pv::util::format_time(second_->time() - first_->time(), prefix, 2));
}
return;
p.setPen(Qt::NoPen);
- p.setBrush(QBrush(View::CursorAreaColour));
+ p.setBrush(QBrush(ViewportFillColour));
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(