From 7d956198cda66c95dded909d51438b0f3a180fca Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 24 Sep 2019 16:00:09 -0700 Subject: [PATCH] re-enable prefer finger over stylus --- interface/src/Application.h | 4 +--- interface/src/ui/PreferencesDialog.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index 198f5ef7cf..684ff6bdaa 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -223,9 +223,7 @@ public: bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); } void setPreferStylusOverLaser(bool value); - // FIXME: Remove setting completely or make available through JavaScript API? - //bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); } - bool getPreferAvatarFingerOverStylus() { return false; } + bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); } void setPreferAvatarFingerOverStylus(bool value); bool getMiniTabletEnabled() { return _miniTabletEnabledSetting.get(); } diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 7e11406808..34cacb733e 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -223,13 +223,11 @@ void setupPreferences() { preferences->addPreference(preference); } - /* - // FIXME: Remove setting completely or make available through JavaScript API? { auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); }; auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Avatar Finger Over Stylus", getter, setter)); - }*/ + } // Snapshots static const QString SNAPSHOTS { "Snapshots" };