Fix object selection browser initialization

Now the selection dialog for trigger and target objects and alias
reference objects selects the the current object properly when
opened and expand the tree to show the selected object.

Task-number: QT3DS-135
Change-Id: If4f42105434ecaa5998c4640f7fbd46f9b5e5edf
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 16 insertions, 6 deletions

diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index aa952321..5d7d7279 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -306,14 +306,19 @@ QObject *ActionView::showTriggerObjectBrowser(const QPoint &point)
 
     m_triggerObjectBrowser->setModel(m_objectsModel);
 
+    const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex);
+    const auto instanceHandle = GetBridge()->GetInstance(actionInfo.m_Owner,
+                                                         actionInfo.m_TriggerObject);
+    m_triggerObjectBrowser->selectAndExpand(instanceHandle);
+
     showBrowser(m_triggerObjectBrowser, point);
 
     connect(m_triggerObjectBrowser, &ObjectBrowserView::selectionChanged,
             this, [this] {
         auto selectedItem = m_triggerObjectBrowser->selectedHandle();
-        setTriggerObject(m_objRefHelper->GetAssetRefValue(selectedItem,
-                                                         m_itemHandle,
-                                                         (CRelativePathTools::EPathType)(m_triggerObjectBrowser->pathType())));
+        setTriggerObject(m_objRefHelper->GetAssetRefValue(
+                             selectedItem, m_itemHandle,
+                             (CRelativePathTools::EPathType)(m_triggerObjectBrowser->pathType())));
     });
 
     return m_triggerObjectBrowser;
@@ -331,14 +336,19 @@ QObject *ActionView::showTargetObjectBrowser(const QPoint &point)
 
     m_targetObjectBrowser->setModel(m_objectsModel);
 
+    const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex);
+    const auto instanceHandle = GetBridge()->GetInstance(actionInfo.m_Owner,
+                                                         actionInfo.m_TargetObject);
+    m_targetObjectBrowser->selectAndExpand(instanceHandle);
+
     showBrowser(m_targetObjectBrowser, point);
 
     connect(m_targetObjectBrowser, &ObjectBrowserView::selectionChanged,
             this, [this] {
         auto selectedItem = m_targetObjectBrowser->selectedHandle();
-        setTargetObject(m_objRefHelper->GetAssetRefValue(selectedItem,
-                                                         m_itemHandle,
-                                                         (CRelativePathTools::EPathType)(m_targetObjectBrowser->pathType())));
+        setTargetObject(m_objRefHelper->GetAssetRefValue(
+                            selectedItem, m_itemHandle,
+                            (CRelativePathTools::EPathType)(m_targetObjectBrowser->pathType())));
         resetFiredEvent();
     });