1 files changed, 33 insertions, 7 deletions

diff --git a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml
index d6e89ba3..d5570fc7 100644
--- a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml
+++ b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml
@@ -192,7 +192,7 @@ Rectangle {
 
                 property int indexOfThisDelegate: index
 
-                width: parent.width
+                width: groupElements.width
                 height: items.height
                 color: "transparent";
                 ListView.delayRemove: true
@@ -394,11 +394,13 @@ Rectangle {
 
                                             readonly property var modelData: model.modelData
                                             text: model.modelData.title
-                                            // Color picked from DataInput icon
-                                            color: model.modelData.controlled?
-                                                       _dataInputColor
-                                                     : _parentView.titleColor(modelData.instance,
-                                                                              modelData.handle)
+                                            // Label is showing "controlled", "invalid data" or
+                                            // ordinary text color.
+                                            color: model.modelData.controlled
+                                                   ? _dataInputColor : model.modelData.validData
+                                                      ? _parentView.titleColor(modelData.instance,
+                                                                               modelData.handle)
+                                                         : _invalidDataIndicatorColor
 
                                             Layout.alignment: Qt.AlignTop
 
@@ -479,7 +481,7 @@ Rectangle {
                                             if (modelData.propertyType === AdditionalMetaDataType.Font)
                                                 return fontDropDown;
                                             if (modelData.propertyType === AdditionalMetaDataType.Texture)
-                                                return textureChooser;
+                                                return imageChooser;
                                             if (modelData.propertyType === AdditionalMetaDataType.String)
                                                 return editLine;
                                             if (modelData.propertyType === AdditionalMetaDataType.None)
@@ -701,6 +703,12 @@ Rectangle {
                                                      Qt.vector4d(valueX, valueY, valueZ, valueW),
                                                      false);
                 }
+                onTriggerUndo: {
+                    _inspectorModel.undo();
+                }
+                onTriggerRedo: {
+                    _inspectorModel.redo();
+                }
             }
         }
     }
@@ -738,6 +746,12 @@ Rectangle {
                     _inspectorModel.setPropertyValue(parent.instance, parent.handle,
                                                      Qt.vector3d(valueX, valueY, valueZ), false);
                 }
+                onTriggerUndo: {
+                    _inspectorModel.undo();
+                }
+                onTriggerRedo: {
+                    _inspectorModel.redo();
+                }
             }
         }
     }
@@ -772,6 +786,12 @@ Rectangle {
                     _inspectorModel.setPropertyValue(parent.instance, parent.handle,
                                                      Qt.vector2d(valueX, valueY), false);
                 }
+                onTriggerUndo: {
+                    _inspectorModel.undo();
+                }
+                onTriggerRedo: {
+                    _inspectorModel.redo();
+                }
             }
         }
     }
@@ -808,6 +828,12 @@ Rectangle {
                     _inspectorModel.setPropertyValue(parent.instance, parent.handle,
                                                      Number(text), true);
                 }
+                onTriggerUndo: {
+                    _inspectorModel.undo();
+                }
+                onTriggerRedo: {
+                    _inspectorModel.redo();
+                }
             }
         }
     }