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

Merge pull request #16219 from zfox23/vrRotationSimplified

Browse source 
DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR
This commit is contained in:
Brad Hefta-Gaub 2019-09-19 12:18:35 -07:00 committed by GitHub
commit 058c74f7d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
View file

@ -71,7 +71,7 @@ Flickable {
ColumnLayout { ColumnLayout {
id: controlsContainer id: controlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 24 Layout.topMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.GraphikSemiBold {
@ -155,6 +155,45 @@ Flickable {
} }
} }
ColumnLayout {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
text: "VR Rotation Mode"
Layout.preferredWidth: parent.width
height: paintedHeight
size: 22
color: simplifiedUI.colors.text.white
}
ColumnLayout {
width: parent.width
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
ButtonGroup { id: rotationButtonGroup }
SimplifiedControls.RadioButton {
text: "Snap Turn"
ButtonGroup.group: rotationButtonGroup
checked: MyAvatar.getSnapTurn() === true
onClicked: {
MyAvatar.setSnapTurn(true);
}
}
SimplifiedControls.RadioButton {
text: "Smooth Turn"
ButtonGroup.group: rotationButtonGroup
checked: MyAvatar.getSnapTurn() === false
onClicked: {
MyAvatar.setSnapTurn(false);
}
}
}
}
ColumnLayout { ColumnLayout {
id: micControlsContainer id: micControlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width