fix vive configuration page

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

View file

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

File diff suppressed because it is too large Load diff