Special trick to make ComboBoxEditor working with QDataWidget mapper.

GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp

@@ -73,8 +73,8 @@ void ComponentFlatView::onDataChanged(const QModelIndex& topLeft, const QModelIn
 {
     SessionItem *item = m_model->itemForIndex(topLeft);
     Q_ASSERT(item);
-    if (item->modelType() == Constants::GroupItemType)
-        updateItemProperties(m_currentItem);
+//    if (item->modelType() == Constants::GroupItemType)
+//        updateItemProperties(m_currentItem);
 }
 
 void ComponentFlatView::updateItemProperties(SessionItem* item)

GUI/coregui/Views/PropertyEditor/CustomEditors.cpp

@@ -221,7 +221,7 @@ void CustomComboEditor::setConnected(bool isConnected)
                 this, &CustomComboEditor::onIndexChanged, Qt::UniqueConnection);
     else
         disconnect(m_box, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                this, &CustomComboEditor::onIndexChanged);
+                   this, &CustomComboEditor::onIndexChanged);
 }
 
 // --- GroupPropertyEditor ---
@@ -269,6 +269,7 @@ void ComboPropertyEditor::onIndexChanged(int index)
     if (comboProperty.currentIndex() != index) {
         comboProperty.setCurrentIndex(index);
         setDataIntern(QVariant::fromValue<ComboProperty>(comboProperty));
+        currentIndexChanged(index);
     }
 }
 

GUI/coregui/Views/PropertyEditor/CustomEditors.h

@@ -89,7 +89,7 @@ private:
     LostFocusFilter* m_focusFilter;
 };
 
-//! Common editor for QComboBox-like cystim editors.
+//! Common editor for QComboBox-like custom editors.
 
 class BA_CORE_API_ CustomComboEditor : public CustomEditor
 {
@@ -109,7 +109,7 @@ protected:
     virtual int internIndex();
     void setConnected(bool isConnected);
 
-    QComboBox* m_box;
+    QComboBox* m_box;    
 };
 
 //! Editor for GroupProperty variant.
@@ -132,10 +132,15 @@ protected:
 
 class BA_CORE_API_ ComboPropertyEditor : public CustomComboEditor
 {
-    Q_OBJECT
+    Q_OBJECT    
 public:
     explicit ComboPropertyEditor(QWidget *parent = nullptr);
 
+
+signals:
+    //! Signal which is used only in the context of ComponentFlatView
+    void currentIndexChanged(int);
+
 protected slots:
     void onIndexChanged(int index);
 

GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp

@@ -19,10 +19,13 @@
 #include "SessionModel.h"
 #include "SessionItemUtils.h"
 #include "SessionModelDelegate.h"
+#include "CustomEditors.h"
 #include <QLabel>
 #include <QWidget>
 #include <QDataWidgetMapper>
 #include <QGridLayout>
+#include <QComboBox>
+#include <QDebug>
 
 PropertyWidgetItem::PropertyWidgetItem(QWidget* parent)
     : QObject(parent)
@@ -56,6 +59,10 @@ void PropertyWidgetItem::setItemEditor(SessionItem* item, QWidget* editor)
     m_dataMapper->addMapping(m_editor, 1);
     m_dataMapper->setItemDelegate(m_delegate);
 
+    // Hack: QDataWidgetMapper doesn't listen for the widget (QComboBox is somewhat special).
+    if (auto combo = dynamic_cast<ComboPropertyEditor*>(editor))
+        connect(combo, &ComboPropertyEditor::currentIndexChanged, [=]{m_delegate->commitData(combo);});
+
     m_label->setEnabled(item->isEnabled());
     m_editor->setEnabled(item->isEnabled());