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

Merge pull request #10027 from druiz17/tablet-disable-vto

Browse source 
Remove visibleToOthers option for the tablet from general settings
This commit is contained in:
Seth Alves 2017-03-27 16:28:23 -07:00 committed by GitHub
commit c013813161
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3788,7 +3788,7 @@ void Application::loadSettings() {
} }
getMyAvatar()->loadData(); getMyAvatar()->loadData();
setTabletVisibleToOthersSetting(false);
_settingsLoaded = true; _settingsLoaded = true;
} }

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

@ -102,11 +102,13 @@ void setupPreferences() {
auto setter = [](bool value) { qApp->setHmdTabletBecomesToolbarSetting(value); }; auto setter = [](bool value) { qApp->setHmdTabletBecomesToolbarSetting(value); };
preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter)); preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter));
} }
{ // TODO
// Note: If this code is added back, you must remove the line "setTabletVisibleToOthersSetting(false)" from Application::loadSettings()
/*{
auto getter = []()->bool { return qApp->getTabletVisibleToOthersSetting(); }; auto getter = []()->bool { return qApp->getTabletVisibleToOthersSetting(); };
auto setter = [](bool value) { qApp->setTabletVisibleToOthersSetting(value); }; auto setter = [](bool value) { qApp->setTabletVisibleToOthersSetting(value); };
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Tablet Is Visible To Others", getter, setter)); preferences->addPreference(new CheckPreference(UI_CATEGORY, "Tablet Is Visible To Others", getter, setter));
} }*/
{ {
auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); }; auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); };
auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); }; auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); };