History

Merge pull request #14362 from ctrlaltdavid/M19768

Add option to enable/disable the mini tablet

Brad Hefta-Gaub committed 7 years ago

Commit 41d82202 parents 47cd6b3 de61f0f6 files · +84 −8Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Application.cpp+7−0
@@ -993,6 +993,7 @@ const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; · 992 unmodified lines
993const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;993const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
994const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;994const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
995const QString DEFAULT_CURSOR_NAME = "DEFAULT";995const QString DEFAULT_CURSOR_NAME = "DEFAULT";
996const bool DEFAULT_MINI_TABLET_ENABLED = true;
996 997
997Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runningMarkerExisted) :998Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runningMarkerExisted) :
998 QApplication(argc, argv),999 QApplication(argc, argv),
@@ -1012,6 +1013,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 13 unmodified lines
1012 _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),1013 _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
1013 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),1014 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
1014 _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),1015 _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),
1016 _miniTabletEnabledSetting("miniTabletEnabled", DEFAULT_MINI_TABLET_ENABLED),
1015 _scaleMirror(1.0f),1017 _scaleMirror(1.0f),
1016 _mirrorYawOffset(0.0f),1018 _mirrorYawOffset(0.0f),
1017 _raiseMirror(0.0f),1019 _raiseMirror(0.0f),
@@ -3393,6 +3395,11 @@ void Application::setSettingConstrainToolbarPosition(bool setting) { · 2375 unmodified lines
3393 DependencyManager::get<OffscreenUi>()->setConstrainToolbarToCenterX(setting);3395 DependencyManager::get<OffscreenUi>()->setConstrainToolbarToCenterX(setting);
3394}3396}
3395 3397
3398void Application::setMiniTabletEnabled(bool enabled) {
3399 _miniTabletEnabledSetting.set(enabled);
3400 emit miniTabletEnabledChanged(enabled);
3401}
3402
3396void Application::showHelp() {3403void Application::showHelp() {
3397 static const QString HAND_CONTROLLER_NAME_VIVE = "vive";3404 static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
3398 static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";3405 static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";