Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 79255bec3f98fa4491a4e81c6cb4529c12b176f0..7aa199c6ec1ca89acd3cbff98c247f755ae5fe95 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,7 +23,9 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
 #include <QLineEdit>
 
 #include "trace.h"
@@ -31,6 +33,7 @@
 #include "view.h"
 
 #include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
 
 namespace pv {
 namespace view {
@@ -38,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),
@@ -116,7 +118,6 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
        const QColor colour = get_colour();
 
-       compute_text_size(p);
        const QRectF label_rect = get_label_rect(right);
 
        // Paint the label
@@ -156,6 +157,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
        // Paint the text
        p.setPen(get_text_colour());
+       p.setFont(QApplication::font());
        p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
@@ -164,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)
@@ -183,10 +185,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        using pv::widgets::Popup;
 
        _popup = new Popup(parent);
-       _popup_form = new QFormLayout(_popup);
-       _popup->setLayout(_popup_form);
 
-       populate_popup_form(_popup, _popup_form);
+       create_popup_form();
 
        connect(_popup, SIGNAL(closed()),
                this, SLOT(on_popup_closed()));
@@ -199,6 +199,26 @@ int Trace::get_y() const
        return _v_offset - _view->v_offset();
 }
 
+QRectF Trace::get_label_rect(int right)
+{
+       using pv::view::View;
+
+       assert(_view);
+
+       QFontMetrics m(QApplication::font());
+       const QSize text_size(
+               m.boundingRect(QRect(), 0, _name).width(),
+               m.boundingRect(QRect(), 0, "Tg").height());
+       const QSizeF label_size(
+               text_size.width() + View::LabelPadding.width() * 2,
+               ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+       const float label_arrow_length = label_size.height() / 2;
+       return QRectF(
+               right - label_arrow_length - label_size.width() - 0.5,
+               get_y() + 0.5f - label_size.height() / 2,
+               label_size.width(), label_size.height());
+}
+
 QColor Trace::get_text_colour() const
 {
        return (_colour.lightness() > 64) ? Qt::black : Qt::white;
@@ -224,10 +244,28 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
        form->addRow(tr("Colour"), colour_button);
 }
 
+void Trace::create_popup_form()
+{
+       // Clear the layout
+
+       // Transfer the layout and the child widgets to a temporary widget
+       // which then goes out of scope destroying the layout and all the child
+       // widgets.
+       if (_popup_form)
+               QWidget().setLayout(_popup_form);
+
+       // Repopulate the popup
+       _popup_form = new QFormLayout(_popup);
+       _popup->setLayout(_popup_form);
+       populate_popup_form(_popup, _popup_form);
+}
+
 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);
@@ -235,29 +273,6 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
        add_colour_option(parent, form);
 }
 
-void Trace::compute_text_size(QPainter &p)
-{
-       _text_size = QSize(
-               p.boundingRect(QRectF(), 0, _name).width(),
-               p.boundingRect(QRectF(), 0, "Tg").height());
-}
-
-QRectF Trace::get_label_rect(int right)
-{
-       using pv::view::View;
-
-       assert(_view);
-
-       const QSizeF label_size(
-               _text_size.width() + View::LabelPadding.width() * 2,
-               ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
-       const float label_arrow_length = label_size.height() / 2;
-       return QRectF(
-               right - label_arrow_length - label_size.width() - 0.5,
-               get_y() + 0.5f - label_size.height() / 2,
-               label_size.width(), label_size.height());
-}
-
 void Trace::on_popup_closed()
 {
        _popup = NULL;