Merge pull request #16219 from zfox23/vrRotationSimplified

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

View file

@ -71,7 +71,7 @@ Flickable {
ColumnLayout {
id: controlsContainer
Layout.preferredWidth: parent.width
Layout.topMargin: 24
Layout.topMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
@ -154,6 +154,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 {
id: micControlsContainer