Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix attachments dialog joint dropdown in tablet

Browse source
This commit is contained in:
David Rowe 2017-03-11 12:52:22 +13:00
parent 189eee01a6
commit 713c50f2e8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/controls-uit/ComboBox.qml
View file

@ -24,6 +24,7 @@ FocusScope {
readonly property alias currentText: comboBox.currentText; readonly property alias currentText: comboBox.currentText;
property alias currentIndex: comboBox.currentIndex; property alias currentIndex: comboBox.currentIndex;
property int dropdownHeight: 480
property int colorScheme: hifi.colorSchemes.light property int colorScheme: hifi.colorSchemes.light
readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
property string label: "" property string label: ""
@ -148,7 +149,7 @@ FocusScope {
FocusScope { FocusScope {
id: popup id: popup
parent: isDesktop ? desktop : parent parent: isDesktop ? desktop : root
anchors.fill: parent anchors.fill: parent
z: isDesktop ? desktop.zLevels.menu : 12 z: isDesktop ? desktop.zLevels.menu : 12
visible: false visible: false
@ -173,7 +174,7 @@ FocusScope {
ScrollView { ScrollView {
id: scrollView id: scrollView
height: 480 height: root.dropdownHeight
width: root.width + 4 width: root.width + 4
property bool hoverEnabled: false; property bool hoverEnabled: false;

2
interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
View file

@ -87,6 +87,7 @@ Item {
} }
Item { Item {
z: 1000
height: jointChooser.height + jointLabel.height + 4 height: jointChooser.height + jointLabel.height + 4
anchors { left: parent.left; right: parent.right; } anchors { left: parent.left; right: parent.right; }
HifiControls.Label { HifiControls.Label {
@ -97,6 +98,7 @@ Item {
} }
HifiControls.ComboBox { HifiControls.ComboBox {
id: jointChooser; id: jointChooser;
dropdownHeight: (typeof desktop !== "undefined") ? 480 : 206
anchors { bottom: parent.bottom; left: parent.left; right: parent.right } anchors { bottom: parent.bottom; left: parent.left; right: parent.right }
colorScheme: hifi.colorSchemes.dark colorScheme: hifi.colorSchemes.dark
currentIndex: attachment ? model.indexOf(attachment.jointName) : -1 currentIndex: attachment ? model.indexOf(attachment.jointName) : -1