From 138092ac3795a7e0f00ebae6e1bfa2801a8be005 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 4 Jan 2018 15:12:34 +1300 Subject: [PATCH] Remove "Prefer Avatar Finger Over Stylus" setting --- interface/src/Application.h | 4 +++- interface/src/ui/PreferencesDialog.cpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index b8b6408273..212c70e6bb 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -209,7 +209,9 @@ public: void setHmdTabletBecomesToolbarSetting(bool value); bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); } void setPreferStylusOverLaser(bool value); - bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); } + // FIXME: Remove setting completely or make available through JavaScript API? + //bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); } + bool getPreferAvatarFingerOverStylus() { return false; } void setPreferAvatarFingerOverStylus(bool value); float getSettingConstrainToolbarPosition() { return _constrainToolbarPosition.get(); } diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index bf0c38847d..1a09af07ab 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -95,11 +95,14 @@ void setupPreferences() { auto setter = [](bool value) { qApp->setPreferStylusOverLaser(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Stylus Over Laser", getter, setter)); } + // 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)); } + */ { static const QString RETICLE_ICON_NAME = { Cursor::Manager::getIconName(Cursor::Icon::RETICLE) }; auto getter = []()->bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; };