X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=5b21bfd84b7012025abe59cdca5f5877491be552;hb=be7170664b80552fdfb38da1c214c271cbf116aa;hp=4b8d2b527a5992dc43c4e58f15c68d02dcf0312d;hpb=c009650038207adcb66938170cbeb36bdf9ed63f;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 4b8d2b5..5b21bfd 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -40,7 +40,6 @@ namespace pv {
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
 	TimeItem(view),
@@ -75,29 +74,23 @@ float TimeMarker::get_x() const
 	return (time_ - view_.offset()) / view_.scale();
 }
 
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(const QRect &rect) const
 {
-	return QPoint(get_x(), 0);
+	return QPoint(get_x(), rect.right());
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
-	const float x = (time_ - view_.offset()) / view_.scale();
-
 	QFontMetrics m(QApplication::font());
-	const float text_width =
-		max(m.boundingRect(get_text()).size().width(), ArrowSize);
-	const float text_height = m.height();
-
-	const QSizeF label_size(
-		text_width + View::LabelPadding.width() * 2,
-		text_height + View::LabelPadding.height() * 2);
+	const QSizeF text_size(
+		max(m.boundingRect(get_text()).size().width(), ArrowSize),
+		m.height());
+	const QSizeF label_size(text_size + LabelPadding * 2);
 	const float top = rect.height() - label_size.height() -
-		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
-	const float height = label_size.height();
+		TimeMarker::ArrowSize - 0.5f;
+	const float x = (time_ - view_.offset()) / view_.scale();
 
-	return QRectF(x - label_size.width() / 2, top,
-		label_size.width(), height);
+	return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
 }
 
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)