diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-09-20 16:23:27 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-09-26 07:28:36 +0000 |
commit | 96409a24a8889541b768aa1387cdb46f4105f57a (patch) | |
tree | 967d30b1c2e22acc53b3c73f1c40ed41ef911ca4 /src/Authoring/Studio/Palettes/controls | |
parent | f5973416b28b29d375fb53206784dc657f45f7c4 (diff) |
Remove hierarchies from Referenced material dialog
The select reference material dialog now only shows a compact list
of existing scene materials (Standard and custom). The material's
object name is also shown between parenthesis.
- Small tweaks for the property linking, inspector combo box style.
- Arrow on image and mesh comboboxes switch direction upon click
Task-number: QT3DS-2312
Change-Id: Id9613bc7bf8b32c48be900247a0fd6aa646003ff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/controls')
-rw-r--r-- | src/Authoring/Studio/Palettes/controls/BrowserCombo.qml | 1 | ||||
-rw-r--r-- | src/Authoring/Studio/Palettes/controls/StyledComboBox.qml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml b/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml index f0089d22..727488f4 100644 --- a/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml +++ b/src/Authoring/Studio/Palettes/controls/BrowserCombo.qml @@ -75,6 +75,7 @@ MouseArea { x: parent.width - 18 y: parent.height / 2 - 8 source: _resDir + "arrow_down.png" + rotation: activeBrowser && activeBrowser.focused ? 180 : 0 } } } diff --git a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml index a5ba5614..4d32d410 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml @@ -81,7 +81,7 @@ ComboBox { } background: Rectangle { anchors.fill: itemDelegate - color: hovered ? _selectionColor : _studioColor2 + color: hovered ? _selectionColor : _backgroundColor } } |