X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=894f023bf11c4d547db8649398905a8e57c8abe8;hp=ad3830590a8b059a1d3006275c3e812f0dff2e8e;hb=786b76785856c6cf8f5916c0b8d76a61695762f9;hpb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index ad383059..894f023b 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,30 +66,34 @@ void TimeMarker::set_time(double time)
 		updating_value_widget_ = false;
 	}
 
-	time_changed();
+	view_.time_item_appearance_changed(true, true);
 }
 
-QRectF TimeMarker::label_rect(const QRectF &rect) const
+float TimeMarker::get_x() const
 {
-	const float x = (time_ - view_.offset()) / view_.scale();
+	return (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.boundingRect("Tg").size().height();
+QPoint TimeMarker::point(const QRect &rect) const
+{
+	return QPoint(get_x(), rect.bottom());
+}
 
-	const QSizeF label_size(
-		text_width + View::LabelPadding.width() * 2,
-		text_height + View::LabelPadding.height() * 2);
+QRectF TimeMarker::label_rect(const QRectF &rect) const
+{
+	QFontMetrics m(QApplication::font());
+	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)
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	if (!enabled())
 		return;
@@ -136,7 +129,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());
@@ -166,6 +159,9 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	Popup *const popup = new Popup(parent);
+	popup->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Bottom);
+
 	QFormLayout *const form = new QFormLayout(popup);
 	popup->setLayout(form);
 
@@ -186,10 +182,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