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

fix vive configuration page

Browse source
This commit is contained in:
Dante Ruiz 2018-06-04 15:16:11 -07:00
parent ed8d12593d
commit 48c0b7379a
2 changed files with 1100 additions and 1080 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,13 @@ Item {
property alias selectedPlugin: box.currentText
Rectangle {
id: inputConfiguration
anchors.fill: parent
anchors {
top: parent.top
left: parent.left
right: parent.right
}
height: 230
HifiConstants { id: hifi }
@ -208,22 +214,26 @@ Item {
anchors.leftMargin: 10
anchors.topMargin: 30
}
}
Rectangle {
id: loaderRectangle
z: -1
color: hifi.colors.baseGray
width: parent.width
anchors.left: parent.left
anchors.right: parent.right
anchors.top: inputConfiguration.bottom
anchors.topMargin: 10
anchors.bottom: parent.bottom
Loader {
id: loader
asynchronous: false
width: inputConfiguration.width
anchors.left: inputConfiguration.left
anchors.right: inputConfiguration.right
anchors.top: configurationHeader.bottom
anchors.topMargin: 10
anchors.bottom: inputConfiguration.bottom
anchors.fill: parent
source: InputConfiguration.configurationLayout(box.currentText);
onLoaded: {
if (loader.item.hasOwnProperty("pluginName")) {
if (box.currentText === "HTC Vive") {
if (box.currentText === "HTC Vive") {
loader.item.pluginName = "OpenVR";
} else {
loader.item.pluginName = box.currentText;

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

File diff suppressed because it is too large Load diff