From b98bd741b8ba3ef0c9215536d145ff2ede27dac8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 26 Sep 2018 18:14:02 +1200 Subject: [PATCH] Indent and reword jumping and flying checkbox --- .../qml/dialogs/preferences/CheckBoxPreference.qml | 1 + interface/src/ui/PreferencesDialog.cpp | 4 +++- libraries/shared/src/Preferences.h | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml index 73819839a1..dd6f9f48d6 100644 --- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml +++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml @@ -54,6 +54,7 @@ Preference { left: parent.left right: parent.right bottom: parent.bottom + leftMargin: preference.indented ? 20 : 0 } text: root.label colorScheme: hifi.colorSchemes.dark diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 85684d1f63..2bc36a3030 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -239,7 +239,9 @@ void setupPreferences() { { auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; - preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Flying & jumping (HMD)", getter, setter)); + auto preference = new CheckPreference(VR_MOVEMENT, "Jumping and flying", getter, setter); + preference->setIndented(true); + preferences->addPreference(preference); } { auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h index e1feea6c1b..102e78544c 100644 --- a/libraries/shared/src/Preferences.h +++ b/libraries/shared/src/Preferences.h @@ -340,10 +340,16 @@ public: class CheckPreference : public BoolPreference { Q_OBJECT + Q_PROPERTY(bool indented READ getIndented CONSTANT) public: CheckPreference(const QString& category, const QString& name, Getter getter, Setter setter) : BoolPreference(category, name, getter, setter) { } Type getType() override { return Checkbox; } + + const bool getIndented() { return _isIndented; } + void setIndented(const bool indented) { _isIndented = indented; } +protected: + bool _isIndented { false }; }; class PrimaryHandPreference : public StringPreference {