diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-18 11:02:18 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-18 10:48:01 +0000 |
commit | c5ea9e8ce658bcc633cd2e0b4b587af4671af5a6 (patch) | |
tree | 68967fe82b705cc726ec70ab71e71483ea325784 /src/Authoring/Studio/Palettes/Action | |
parent | 28a223aba34b4c3913a7c284b255dd81f16af3d7 (diff) |
Fix object name update on action palette
Task-number: QT3DS-1119
Change-Id: Ia47e111126552241a0b13917485245f75dd3d6c3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Action')
-rw-r--r-- | src/Authoring/Studio/Palettes/Action/ActionView.cpp | 9 | ||||
-rw-r--r-- | src/Authoring/Studio/Palettes/Action/ActionView.h | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp index f447e20e..17f7b679 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp +++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp @@ -167,6 +167,7 @@ void ActionView::setItem(const qt3dsdm::Qt3DSDMInstanceHandle &handle) } emitActionChanged(); Q_EMIT itemChanged(); + Q_EMIT itemTextChanged(); } QString ActionView::itemIcon() const @@ -750,11 +751,13 @@ void ActionView::OnHandlerArgumentModified(qt3dsdm::Qt3DSDMHandlerArgHandle inHa void ActionView::OnInstancePropertyValueChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMPropertyHandle inProperty) { - Q_UNUSED(inProperty) - Q_UNUSED(inInstance) - if (!m_itemHandle.Valid()) + if (!m_itemHandle.Valid() || m_itemHandle != inInstance) return; + auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge(); + if (inProperty == bridge->GetNameProperty()) + Q_EMIT itemTextChanged(); + emitActionChanged(); } diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h index cbb47b99..61c49d9a 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.h +++ b/src/Authoring/Studio/Palettes/Action/ActionView.h @@ -84,7 +84,7 @@ class ActionView : public QQuickWidget, Q_PROPERTY(QAbstractItemModel *actionsModel READ actionsModel NOTIFY itemChanged FINAL) Q_PROPERTY(QAbstractItemModel *propertyModel READ propertyModel NOTIFY propertyModelChanged FINAL) Q_PROPERTY(QString itemIcon READ itemIcon NOTIFY itemChanged FINAL) - Q_PROPERTY(QString itemText READ itemText NOTIFY itemChanged FINAL) + Q_PROPERTY(QString itemText READ itemText NOTIFY itemTextChanged FINAL) Q_PROPERTY(QColor itemColor READ itemColor NOTIFY itemChanged FINAL) Q_PROPERTY(bool hasItem MEMBER m_hasItem NOTIFY hasItemChanged FINAL) Q_PROPERTY(QString triggerObjectName READ triggerObjectName NOTIFY actionChanged FINAL) @@ -154,6 +154,7 @@ protected: Q_SIGNALS: void itemChanged(); + void itemTextChanged(); void actionChanged(); void propertyModelChanged(); void propertyChanged(); |