From 053ae0e0ed72a012bb4d815b65a7c76ea0c4b326 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 26 Sep 2018 17:42:44 +1200 Subject: [PATCH] Use radio buttons for VR advanced movement options --- interface/src/ui/PreferencesDialog.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index a98d1ae1f1..85684d1f63 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -226,13 +226,15 @@ void setupPreferences() { static const QString VR_MOVEMENT{ "VR Movement" }; { - - static const QString movementsControlChannel = QStringLiteral("Hifi-Advanced-Movement-Disabler"); - auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; - auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; - preferences->addPreference(new CheckPreference(VR_MOVEMENT, - QStringLiteral("Advanced movement in VR (Teleport movement when unchecked)"), - getter, setter)); + auto getter = [myAvatar]()->int { return myAvatar->useAdvancedMovementControls() ? 1 : 0; }; + auto setter = [myAvatar](int value) { myAvatar->setUseAdvancedMovementControls(value == 1); }; + auto preference = + new RadioButtonsPreference(VR_MOVEMENT, "Teleporting only / Walking and teleporting", getter, setter); + QStringList items; + items << "Teleporting only" << "Walking and teleporting"; + preference->setHeading("Movement mode"); + preference->setItems(items); + preferences->addPreference(preference); } { auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); };