X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=e4704be497500fd3323ef254ca2dc6c35086d06f;hp=2f2bc482f22cc567c408723cd6eb8eedd651df32;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hpb=dae21ebcf60d6a5d7c194736b1dc792a5cbf06a5

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 2f2bc482..e4704be4 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -64,7 +64,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 	const shared_ptr<Cursor> other(get_other_cursor());
 	assert(other);
 
-	const float x = (time_ - view_.offset()) / view_.scale();
+	const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
 
 	QFontMetrics m(QApplication::font());
 	QSize text_size = m.boundingRect(get_text()).size();
@@ -76,14 +76,13 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 		TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	const double other_time = other->time();
+	const pv::util::Timestamp& other_time = other->time();
+
 	if (time_ > other_time ||
-		(abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
-		this > other.get()))
+		(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);
+		return QRectF(x - label_size.width(), top, label_size.width(), height);
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const