View: Restore the original signals_changed() positioning code

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 47e91f4b9a67f9a904d0b059e3da5cee543a35ab..5cd5b183590af45dcd783dd948f3a0d81af84582 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -66,8 +66,7 @@ Signal::Signal(pv::Session &session,
        channel_(channel),
        scale_handle_(make_shared<SignalScaleHandle>(*this)),
        items_({scale_handle_}),
-       name_widget_(nullptr),
-       updating_name_widget_(false)
+       name_widget_(nullptr)
 {
        assert(channel_);
 }
@@ -75,9 +74,9 @@ Signal::Signal(pv::Session &session,
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
-       updating_name_widget_ = true;
-       name_widget_->setEditText(name);
-       updating_name_widget_ = false;
+
+       if (name != name_widget_->currentText())
+               name_widget_->setEditText(name);
 
        // Store the channel name in sigrok::Channel so that it
        // will end up in the .sr file upon save.
@@ -107,11 +106,17 @@ const ViewItemOwner::item_list& Signal::child_items() const
        return items_;
 }
 
+void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (channel_->enabled())
+               Trace::paint_back(p, pp);
+}
+
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        name_widget_ = new QComboBox(parent);
        name_widget_->setEditable(true);
-       name_widget_->setCompleter(0);
+       name_widget_->setCompleter(nullptr);
 
        for (unsigned int i = 0; i < countof(ChannelNames); i++)
                name_widget_->insertItem(i, ChannelNames[i]);