X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=a96b0327e0e6ffd6f5364876b928ebaa87077daf;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hp=df6bd63d041ec74a4228919ea4383afb2c982ae4;hpb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index df6bd63d..a96b0327 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -124,7 +124,7 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 
 QMenu* Trace::create_context_menu(QWidget *parent)
 {
-	QMenu *const menu = SelectableItem::create_context_menu(parent);
+	QMenu *const menu = ViewItem::create_context_menu(parent);
 
 	return menu;
 }
@@ -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 QRectF &rect) const
+{
+	const float h = QFontMetrics(QApplication::font()).height();
+	return QRectF(rect.left(), get_visual_y() - h / 2.0f,
+		rect.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));
@@ -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