Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 06:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

28
interface/resources/qml/hifi/tablet/ControllerSettings.qml
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,18 +214,22 @@ 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")) {

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

@ -15,13 +15,22 @@ import "../../controls-uit" as HifiControls
import "." import "."
Rectangle { Flickable {
id: openVrConfiguration id: flick
width: parent.width width: parent.width
height: parent.height height: parent.height
anchors.fill: parent anchors.fill: parent
contentWidth: openVrConfiguration.width
contentHeight: 550
flickableDirection: Flickable.VerticalFlick
Component.onCompleted: {
config.createObject(flick.contentItem);
}
Component {
id: config
Rectangle {
id: openVrConfiguration
property int leftMargin: 75 property int leftMargin: 75
property int countDown: 0 property int countDown: 0
property string pluginName: "" property string pluginName: ""
@ -73,8 +82,7 @@ Rectangle {
size: 12 size: 12
color: "white" color: "white"
anchors.left: openVrConfiguration.left
anchors.left: parent.left
anchors.leftMargin: leftMargin anchors.leftMargin: leftMargin
} }
@ -215,7 +223,7 @@ Rectangle {
anchors.top: (headOffsets.visible ? headOffsets.bottom : headConfig.bottom) anchors.top: (headOffsets.visible ? headOffsets.bottom : headConfig.bottom)
anchors.topMargin: (headOffsets.visible ? 22 : 10) anchors.topMargin: (headOffsets.visible ? 22 : 10)
anchors.left: parent.left anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin anchors.leftMargin: leftMargin
} }
@ -377,7 +385,7 @@ Rectangle {
id: feetConfig id: feetConfig
anchors.top: additional.bottom anchors.top: additional.bottom
anchors.topMargin: 15 anchors.topMargin: 15
anchors.left: openVrConfiguration.left anchors.left: parent.left
anchors.leftMargin: leftMargin + 10 anchors.leftMargin: leftMargin + 10
spacing: 10 spacing: 10
@ -1103,4 +1111,6 @@ Rectangle {
InputConfiguration.setConfigurationSettings(settings, pluginName); InputConfiguration.setConfigurationSettings(settings, pluginName);
updateCalibrationButton(); updateCalibrationButton();
} }
}
}
} }