X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=7aa199c6ec1ca89acd3cbff98c247f755ae5fe95;hp=ae8ee901a27316738434c6f8e64a29376a77496f;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hpb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ae8ee901..7aa199c6 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -25,6 +25,7 @@
 
 #include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
 #include <QLineEdit>
 
 #include "trace.h"
@@ -32,6 +33,7 @@
 #include "view.h"
 
 #include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
 
 namespace pv {
 namespace view {
@@ -39,8 +41,7 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
-Trace::Trace(pv::SigSession &session, QString name) :
-	_session(session),
+Trace::Trace(QString name) :
 	_name(name),
 	_v_offset(0),
 	_popup(NULL),
@@ -165,7 +166,7 @@ bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
 	(void)left;
 
 	const QRectF label = get_label_rect(right);
-	return QRectF(
+	return enabled() && QRectF(
 		QPointF(label.left() - LabelHitPadding,
 			label.top() - LabelHitPadding),
 		QPointF(right, label.bottom() + LabelHitPadding)
@@ -263,6 +264,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	QLineEdit *const name_edit = new QLineEdit(parent);
 	name_edit->setText(_name);
+	name_edit->selectAll();
+	name_edit->setFocus();
 	connect(name_edit, SIGNAL(textChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
 	form->addRow(tr("Name"), name_edit);