summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2019-08-21 13:02:14 +0300
committerJanne Kangas <janne.kangas@qt.io>2019-08-21 13:16:56 +0300
commit06d898dea46fc849d141919a1f184d7965e6d373 (patch)
treea936b568a3a384b701824481fc7c3d2df5e6ebfc
parent7f615fa51d166a6c7565e5dde59aa3e325399cf0 (diff)
Differentiate between elements with common root in datainput dialog
Fixes bug where datainput dialog stuck in a loop due to string comparison not differentiating between two elements with common root path. Change-Id: Ibeea8614d8e36fe9d96df30734c6150368f8b8dc Task-id: QT3DS-3885 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Qt3DStudio/Application/DataInputListDlg.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Authoring/Qt3DStudio/Application/DataInputListDlg.cpp b/src/Authoring/Qt3DStudio/Application/DataInputListDlg.cpp
index 28136c95..1572ad2c 100644
--- a/src/Authoring/Qt3DStudio/Application/DataInputListDlg.cpp
+++ b/src/Authoring/Qt3DStudio/Application/DataInputListDlg.cpp
@@ -297,6 +297,10 @@ void CDataInputListDlg::updateInfo()
auto path = refHelper->GetObjectReferenceString(
doc->GetSceneInstance(), CRelativePathTools::EPATHTYPE_GUID,
allCtrldElemsIt->instHandle).toQString();
+ // Differentiate between paths such as Scene.Layer and Scene.Layer.Light by adding
+ // whitespace, and simultaneously create separation between element path and
+ // count of controlled properties which is shown in UI.
+ path.append(QLatin1Char(' '));
// One element can have several properties controlled by this datainput,
// do not show element several times. Show the number of properties after
// the elementpath and the list of property names in a separate column.