Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 {
id: comboBoxLabel
text: root.label

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

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

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

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