History

add setting to control if tablet is an entity or overlay

Seth Alves committed 9 years ago

Commit 41ef7b81 parent 4a778b93 files · +15 −1Browse files

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

Unified · Split

interface/src/Application.cpp+7−0
@@ -548,6 +548,7 @@ const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 100.0f; · 547 unmodified lines
548548 const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
549549 const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
550550 const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
551+const bool DEFAULT_TABLET_VISIBLE_TO_OTHERS = false;
551552
552553 Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) :
553554 QApplication(argc, argv),
@@ -570,6 +571,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 16 unmodified lines
570571 _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT),
571572 _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR),
572573 _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
574+ _tabletVisibleToOthersSetting("tabletVisibleToOthers", DEFAULT_TABLET_VISIBLE_TO_OTHERS),
573575 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
574576 _scaleMirror(1.0f),
575577 _rotateMirror(0.0f),
@@ -2348,6 +2350,11 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) { · 1772 unmodified lines
23482350 updateSystemTabletMode();
23492351 }
23502352
2353+void Application::setTabletVisibleToOthersSetting(bool value) {
2354+ _tabletVisibleToOthersSetting.set(value);
2355+ updateSystemTabletMode();
2356+}
2357+
23512358 void Application::setSettingConstrainToolbarPosition(bool setting) {
23522359 _constrainToolbarPosition.set(setting);
23532360 DependencyManager::get<OffscreenUi>()->setConstrainToolbarToCenterX(setting);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t