- compute_text_size(p, prefix);
- const QRectF r(get_label_rect(rect));
-
- const float h_centre = (r.left() + r.right()) / 2;
- const QPointF points[] = {
- r.topRight(),
- QPointF(r.right(), r.bottom()),
- QPointF(h_centre + ArrowSize, r.bottom()),
- QPointF(h_centre, rect.bottom()),
- QPointF(h_centre - ArrowSize, r.bottom()),
- QPointF(r.left(), r.bottom()),
- r.topLeft()
- };
-
- const QPointF highlight_points[] = {
- QPointF(r.right() - 1, r.top() + 1),
- QPointF(r.right() - 1, r.bottom() - 1),
- QPointF(h_centre + ArrowSize - 1, r.bottom() - 1),
- QPointF(h_centre, rect.bottom() - 1),
- QPointF(h_centre - ArrowSize + 1, r.bottom() - 1),
- QPointF(r.left() + 1, r.bottom() - 1),
- QPointF(r.left() + 1, r.top() + 1),
- };
-
- p.setPen(Qt::transparent);
- p.setBrush(FillColour);
- p.drawPolygon(points, countof(points));
-
- p.setPen(HighlightColour);
- p.setBrush(Qt::transparent);
- p.drawPolygon(highlight_points, countof(highlight_points));
-
- p.setPen(LineColour);
- p.setBrush(Qt::transparent);
- p.drawPolygon(points, countof(points));
-
- p.setPen(TextColour);
- p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
- Ruler::format_time(_time, prefix, 2));
+ const shared_ptr<Cursor> other(get_other_cursor());
+ assert(other);
+
+ const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
+
+ QFontMetrics m(QApplication::font());
+ QSize text_size = m.boundingRect(get_text()).size();
+
+ const QSizeF label_size(
+ text_size.width() + LabelPadding.width() * 2,
+ text_size.height() + LabelPadding.height() * 2);
+ const float top = rect.height() - label_size.height() -
+ TimeMarker::ArrowSize - 0.5f;
+ const float height = label_size.height();
+
+ const pv::util::Timestamp& other_time = other->time();
+
+ if (time_ > other_time ||
+ (abs(time_ - other_time).is_zero() && this > other.get()))
+ return QRectF(x, top, label_size.width(), height);
+ else
+ return QRectF(x - label_size.width(), top, label_size.width(), height);