Merge pull request #31822 from cbjeukendrup/fix_textstylepopup_init

Author: cbjeukendrup

src/inspector/qml/MuseScore/Inspector/abstractinspectormodel.h

@@ -51,8 +51,7 @@ using MeasurementUnits = CommonTypes::MeasurementUnits;
 class AbstractInspectorModel : public QObject, public QQmlParserStatus, public muse::async::Asyncable, public muse::Injectable
 {
     Q_OBJECT
-    QML_ELEMENT;
-    QML_UNCREATABLE("Not creatable as it is abstract base class")
+    Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(int icon READ icon CONSTANT)
@@ -63,6 +62,9 @@ class AbstractInspectorModel : public QObject, public QQmlParserStatus, public m
     Q_PROPERTY(bool isSystemObjectBelowBottomStaff READ isSystemObjectBelowBottomStaff NOTIFY isSystemObjectBelowBottomStaffChanged)
     Q_PROPERTY(mu::inspector::CommonTypes::MeasurementUnits measurementUnits READ measurementUnits NOTIFY measurementUnitsChanged)
 
+    QML_ELEMENT;
+    QML_UNCREATABLE("Not creatable as it is abstract base class")
+
 public:
     muse::Inject<context::IGlobalContext> context = { this };
     muse::Inject<muse::actions::IActionsDispatcher> dispatcher = { this };

src/inspector/qml/MuseScore/Inspector/text/textsettingsmodel.h

@@ -82,6 +82,8 @@ class TextSettingsModel : public AbstractInspectorModel
 public:
     explicit TextSettingsModel(QObject* parent, IElementRepositoryService* repository, bool isTextLineText);
 
+    void classBegin() override;
+
     Q_INVOKABLE void insertSpecialCharacters();
     Q_INVOKABLE void showStaffTextProperties();
 
@@ -165,8 +167,6 @@ public slots:
     void rightPositionTextChanged(QString rightPositionText);
 
 private:
-    void classBegin() override;
-
     bool isTextEditingStarted() const;
     muse::async::Notification isTextEditingChanged() const;
 

src/inspector/qml/MuseScore/Inspector/text/textstylepopup/textstylepopupmodel.cpp

@@ -29,22 +29,27 @@ using namespace mu::inspector;
 
 TextStylePopupModel::TextStylePopupModel(QObject* parent)
     : AbstractElementPopupModel(PopupModelType::TYPE_TEXT, parent)
-
     , m_elementRepositoryService{std::make_unique<ElementRepositoryService>()}
+    , m_textSettingsModel(new TextSettingsModel(this, m_elementRepositoryService.get(), /*isTextLineText*/ false))
 {
-    m_textSettingsModel = new TextSettingsModel(this, m_elementRepositoryService.get(), /*isTextLineText*/ false);
-    m_textSettingsModel->init();
 }
 
 TextStylePopupModel::~TextStylePopupModel() = default;
 
-void TextStylePopupModel::init()
+void TextStylePopupModel::classBegin()
 {
     AbstractElementPopupModel::init();
 
+    m_textSettingsModel->classBegin();
+    m_textSettingsModel->init();
+
     m_elementRepositoryService->updateElementList({ m_item }, notation::SelectionState::LIST);
 }
 
+void TextStylePopupModel::init()
+{
+}
+
 TextSettingsModel* TextStylePopupModel::textSettingsModel() const
 {
     return m_textSettingsModel;

src/inspector/qml/MuseScore/Inspector/text/textstylepopup/textstylepopupmodel.h

@@ -24,6 +24,7 @@
 
 #include <memory>
 
+#include <QQmlParserStatus>
 #include <qqmlintegration.h>
 
 #include "notationscene/qml/MuseScore/NotationScene/abstractelementpopupmodel.h"
@@ -33,14 +34,16 @@
 namespace mu::inspector {
 class ElementRepositoryService;
 
-class TextStylePopupModel : public notation::AbstractElementPopupModel
+class TextStylePopupModel : public notation::AbstractElementPopupModel, public QQmlParserStatus
 {
     Q_OBJECT
-    QML_ELEMENT
+    Q_INTERFACES(QQmlParserStatus)
 
-    Q_PROPERTY(TextSettingsModel* textSettingsModel READ textSettingsModel CONSTANT)
+    Q_PROPERTY(TextSettingsModel * textSettingsModel READ textSettingsModel CONSTANT)
     Q_PROPERTY(bool placeAbove READ placeAbove NOTIFY placeAboveChanged)
 
+    QML_ELEMENT
+
 public:
     explicit TextStylePopupModel(QObject* parent = nullptr);
     ~TextStylePopupModel();
@@ -55,12 +58,14 @@ class TextStylePopupModel : public notation::AbstractElementPopupModel
     void placeAboveChanged();
 
 private:
+    void classBegin() override;
+    void componentComplete() override {}
+
     void updateItemRect() override;
     bool ignoreTextEditingChanges() const override { return false; }
 
-    TextSettingsModel* m_textSettingsModel = nullptr;
-
     std::unique_ptr<ElementRepositoryService> m_elementRepositoryService;
+    TextSettingsModel* m_textSettingsModel = nullptr;
 
     bool m_placeAbove = true;
 };