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

fixing some issues

Browse source
This commit is contained in:
Dante Ruiz 2018-06-04 16:09:31 -07:00
parent 48c0b7379a
commit f5e2a6834b
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,10 @@ FocusScope {
} }
} }
function textAt(index) {
return comboBox.textAt(index);
}
HifiControls.Label { HifiControls.Label {
id: comboBoxLabel id: comboBoxLabel
text: root.label text: root.label

7
interface/resources/qml/hifi/tablet/ControllerSettings.qml
View file

@ -174,7 +174,7 @@ Item {
text: "show all input devices" text: "show all input devices"
onClicked: { onClicked: {
inputPlugins(); box.model = inputPlugins();
changeSource(); changeSource();
} }
} }
@ -262,11 +262,12 @@ Item {
function changeSource() { function changeSource() {
loader.source = ""; loader.source = "";
var selectedDevice = box.textAt(box.currentIndex);
var source = ""; var source = "";
if (box.currentText == "Vive") { if (selectedDevice == "HTC Vive") {
source = InputConfiguration.configurationLayout("OpenVR"); source = InputConfiguration.configurationLayout("OpenVR");
} else { } else {
source = InputConfiguration.configurationLayout(box.currentText); source = InputConfiguration.configurationLayout(selectedDevice);
} }
loader.source = source; loader.source = source;

1
interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
View file

@ -20,7 +20,6 @@ Flickable {
width: parent.width width: parent.width
height: parent.height height: parent.height
anchors.fill: parent anchors.fill: parent
contentWidth: openVrConfiguration.width
contentHeight: 550 contentHeight: 550
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick