X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=47ba34559a1dd15fa45fc2ff4d979d6a23f17dab;hp=eebac024cca0c81608d5452a560544e235081813;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hpb=689dea92f288564260ef521f6f499e03e3cdbbd2

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index eebac024..47ba3455 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),
@@ -57,16 +56,6 @@ double TimeMarker::time() const
 	return time_;
 }
 
-float TimeMarker::get_x() const
-{
-	return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
-	return QPoint(get_x(), 0);
-}
-
 void TimeMarker::set_time(double time)
 {
 	time_ = time;
@@ -77,14 +66,17 @@ void TimeMarker::set_time(double time)
 		updating_value_widget_ = false;
 	}
 
-	time_changed();
+	view_.time_item_appearance_changed(true, true);
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
 {
-	const float x = get_x();
-	p.setPen(colour_.darker());
-	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+	return (time_ - view_.offset()) / view_.scale();
+}
+
+QPoint TimeMarker::point() const
+{
+	return QPoint(get_x(), 0);
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
@@ -94,20 +86,20 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
 	QFontMetrics m(QApplication::font());
 	const float text_width =
 		max(m.boundingRect(get_text()).size().width(), ArrowSize);
-	const float text_height = m.boundingRect("Tg").size().height();
+	const float text_height = m.height();
 
 	const QSizeF label_size(
-		text_width + View::LabelPadding.width() * 2,
-		text_height + View::LabelPadding.height() * 2);
+		text_width + LabelPadding.width() * 2,
+		text_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();
 
 	return QRectF(x - label_size.width() / 2, top,
 		label_size.width(), height);
 }
 
-void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	if (!enabled())
 		return;
@@ -143,7 +135,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	}
 
 	p.setPen(Qt::transparent);
-	p.setBrush(colour_);
+	p.setBrush(hover ? colour_.lighter() : colour_);
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(colour_.lighter());
@@ -158,6 +150,16 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (!enabled())
+		return;
+
+	const float x = get_x();
+	p.setPen(colour_.darker());
+	p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
+}
+
 pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 {
 	using pv::widgets::Popup;
@@ -183,10 +185,8 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(double value)
 {
-	if (!updating_value_widget_) {
-		time_ = value;
-		time_changed();
-	}
+	if (!updating_value_widget_)
+		set_time(value);
 }
 
 } // namespace view