Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

21539: Moved Desktop HMD to None

Browse source
This commit is contained in:
Menithal 2017-11-26 21:58:16 +02:00
parent e28f80401f
commit ba1cd74ffe
1 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,10 +55,6 @@ Rectangle {
} }
MouseArea { MouseArea {
id: mouseArea id: mouseArea
@ -101,6 +97,7 @@ Rectangle {
onClicked: { onClicked: {
if (checked) { if (checked) {
headPuckBox.checked = false; headPuckBox.checked = false;
hmdInDesktop.checked = false;
} else { } else {
checked = true; checked = true;
} }
@ -123,6 +120,7 @@ Rectangle {
onClicked: { onClicked: {
if (checked) { if (checked) {
headBox.checked = false; headBox.checked = false;
hmdInDesktop.checked = false;
} else { } else {
checked = true; checked = true;
} }
@ -135,6 +133,37 @@ Rectangle {
text: "Tracker" text: "Tracker"
color: hifi.colors.lightGrayText color: hifi.colors.lightGrayText
} }
HifiControls.CheckBox {
id: hmdInDesktop
width: 15
height: 15
boxRadius: 7
visible: viveInDesktop.checked
anchors.top: viveInDesktop.bottom
anchors.topMargin: 5
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 10
onClicked: {
if (checked) {
headBox.checked = false;
headPuckBox.checked = false;
} else {
checked = true;
}
sendConfigurationSettings();
}
}
RalewayBold {
id: hmdInDesktopLabel
size: 12
visible: viveInDesktop.checked
text: "None"
color: hifi.colors.lightGrayText
}
} }
Row { Row {
@ -800,34 +829,6 @@ Rectangle {
to: 0 to: 0
} }
HifiControls.CheckBox {
id: hmdInDesktop
width: 15
height: 15
boxRadius: 7
anchors.top: viveInDesktop.bottom
anchors.topMargin: 5
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 10
onClicked: {
sendConfigurationSettings();
}
}
RalewayBold {
id: hmdDesktopText
size: 10
text: "Use HMD in desktop mode"
color: hifi.colors.white
anchors {
left: hmdInDesktop.right
leftMargin: 5
verticalCenter: hmdInDesktop.verticalCenter
}
}
function logAction(action, status) { function logAction(action, status) {
console.log("calibrated from ui"); console.log("calibrated from ui");