Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 05:17:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Indent and reword jumping and flying checkbox

Browse source
This commit is contained in:
David Rowe 2018-09-26 18:14:02 +12:00
parent 053ae0e0ed
commit b98bd741b8
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
View file

@ -54,6 +54,7 @@ Preference {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
leftMargin: preference.indented ? 20 : 0
} }
text: root.label text: root.label
colorScheme: hifi.colorSchemes.dark colorScheme: hifi.colorSchemes.dark

4
interface/src/ui/PreferencesDialog.cpp
View file

@ -239,7 +239,9 @@ void setupPreferences() {
{ {
auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); };
auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; 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; }; auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; };

6
libraries/shared/src/Preferences.h
View file

@ -340,10 +340,16 @@ public:
class CheckPreference : public BoolPreference { class CheckPreference : public BoolPreference {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool indented READ getIndented CONSTANT)
public: public:
CheckPreference(const QString& category, const QString& name, Getter getter, Setter setter) CheckPreference(const QString& category, const QString& name, Getter getter, Setter setter)
: BoolPreference(category, name, getter, setter) { } : BoolPreference(category, name, getter, setter) { }
Type getType() override { return Checkbox; } 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 { class PrimaryHandPreference : public StringPreference {