X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=2f2bc482f22cc567c408723cd6eb8eedd651df32;hb=d40f4db76fc8120fcd54ace8c6fce63387e025ca;hp=5f33416050d721b21af2b00835dc341259aeb391;hpb=689dea92f288564260ef521f6f499e03e3cdbbd2;p=pulseview.git

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 5f334160..2f2bc482 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -32,8 +32,11 @@
 
 #include <cassert>
 #include <cstdio>
+#include <limits>
 
+using std::abs;
 using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
 namespace view {
@@ -52,7 +55,8 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-	return pv::util::format_time(time_, view_.tick_prefix(), 2);
+	return util::format_time(time_, view_.tick_prefix(),
+		view_.time_unit(), 2);
 }
 
 QRectF Cursor::label_rect(const QRectF &rect) const
@@ -66,13 +70,16 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 	QSize text_size = m.boundingRect(get_text()).size();
 
 	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 float top = rect.height() - label_size.height() -
-		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+		TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	if (time_ > other->time())
+	const double other_time = other->time();
+	if (time_ > other_time ||
+		(abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
+		this > other.get()))
 		return QRectF(x, top, label_size.width(), height);
 	else
 		return QRectF(x - label_size.width(), top,