X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=2e15ca958a1da81af2ebba507328da0b9cb801b6;hp=b24afac24ac303d99275749342a7485f2633841f;hb=cbf0f87e496c9d9157591c94dc445aaa960fe79d;hpb=26e3af6b15f083239981729b2c3c109ed1d87ba8

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index b24afac2..2e15ca95 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -43,8 +43,8 @@ const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
 	name_(name),
-	popup_(NULL),
-	popup_form_(NULL)
+	popup_(nullptr),
+	popup_form_(nullptr)
 {
 }
 
@@ -134,6 +134,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	popup_ = new Popup(parent);
+	popup_->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Right);
 
 	create_popup_form();
 
@@ -149,11 +151,10 @@ QRectF Trace::label_rect(const QRectF &rect) const
 
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
-		m.boundingRect(QRect(), 0, name_).width(),
-		m.boundingRect(QRect(), 0, "Tg").height());
+		m.boundingRect(QRect(), 0, name_).width(), m.height());
 	const QSizeF label_size(
-		text_size.width() + View::LabelPadding.width() * 2,
-		ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+		text_size.width() + LabelPadding.width() * 2,
+		ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
 	const float half_height = label_size.height() / 2;
 	return QRectF(
 		rect.right() - half_height - label_size.width() - 0.5,
@@ -162,7 +163,14 @@ QRectF Trace::label_rect(const QRectF &rect) const
 		label_size.height());
 }
 
-void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y)
+QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
+{
+	const float h = QFontMetrics(QApplication::font()).height();
+	return QRectF(pp.left(), get_visual_y() - h / 2.0f,
+		pp.width(), h);
+}
+
+void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
 	p.setPen(AxisPen);
 	p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
@@ -211,8 +219,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::on_popup_closed()
 {
-	popup_ = NULL;
-	popup_form_ = NULL;
+	popup_ = nullptr;
+	popup_form_ = nullptr;
 }
 
 void Trace::on_text_changed(const QString &text)
@@ -228,7 +236,7 @@ void Trace::on_colour_changed(const QColor &colour)
 	set_colour(colour);
 
 	if (owner_)
-		owner_->appearance_changed(true, false);
+		owner_->row_item_appearance_changed(true, false);
 }
 
 } // namespace view