X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=df5a954b43a216f66d7cb11c5799464d882a3fe4;hp=e9235e56f2713bfd348f29ab6c3c14112968f81d;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hpb=d8d724cc987b7edb6a5e4e9d0dc8415f3cca06e9

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e9235e56..df5a954b 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -68,7 +68,7 @@ void Trace::set_colour(QColor colour)
 	colour_ = colour;
 }
 
-void Trace::paint_label(QPainter &p, int right, bool hover)
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
 
@@ -77,7 +77,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	if (!enabled())
 		return;
 
-	const QRectF r = label_rect(right);
+	const QRectF r = label_rect(rect);
 
 	// Paint the label
 	const float label_arrow_length = r.height() / 2;
@@ -124,7 +124,7 @@ void Trace::paint_label(QPainter &p, int right, 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;
 }
@@ -143,26 +143,25 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	return popup_;
 }
 
-QRectF Trace::label_rect(int right) const
+QRectF Trace::label_rect(const QRectF &rect) const
 {
 	using pv::view::View;
 
 	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(
-		right - half_height - label_size.width() - 0.5,
+		rect.right() - half_height - label_size.width() - 0.5,
 		get_visual_y() + 0.5f - half_height,
 		label_size.width() + half_height,
 		label_size.height());
 }
 
-void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y)
+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 +227,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