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

Merge pull request #13524 from danteruiz/fix-calibration

Browse source 
fix configuration page
This commit is contained in:
John Conklin II 2018-07-03 13:13:48 -07:00 committed by GitHub
commit 6737647a56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,7 @@ Item {
id: stack id: stack
initialItem: inputConfiguration initialItem: inputConfiguration
property alias messageVisible: imageMessageBox.visible property alias messageVisible: imageMessageBox.visible
property string selectedPlugin: ""
Rectangle { Rectangle {
id: inputConfiguration id: inputConfiguration
anchors { anchors {
@ -274,6 +275,8 @@ Item {
} else { } else {
box.label = ""; box.label = "";
} }
stack.selectedPlugin = selectedDevice;
} }
Timer { Timer {

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

@ -28,6 +28,7 @@ Flickable {
onPluginNameChanged: { onPluginNameChanged: {
if (page !== null) { if (page !== null) {
page.pluginName = flick.pluginName; page.pluginName = flick.pluginName;
page.displayConfiguration();
} }
} }