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
548const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;548const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
549const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;549const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
550const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;550const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
551const bool DEFAULT_TABLET_VISIBLE_TO_OTHERS = false;
551 552
552Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) :553Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) :
553 QApplication(argc, argv),554 QApplication(argc, argv),
@@ -570,6 +571,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 16 unmodified lines
570 _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT),571 _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT),
571 _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR),572 _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR),
572 _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),573 _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
574 _tabletVisibleToOthersSetting("tabletVisibleToOthers", DEFAULT_TABLET_VISIBLE_TO_OTHERS),
573 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),575 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
574 _scaleMirror(1.0f),576 _scaleMirror(1.0f),
575 _rotateMirror(0.0f),577 _rotateMirror(0.0f),
@@ -2348,6 +2350,11 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) { · 1772 unmodified lines
2348 updateSystemTabletMode();2350 updateSystemTabletMode();
2349}2351}
2350 2352
2353void Application::setTabletVisibleToOthersSetting(bool value) {
2354 _tabletVisibleToOthersSetting.set(value);
2355 updateSystemTabletMode();
2356}
2357
2351void Application::setSettingConstrainToolbarPosition(bool setting) {2358void Application::setSettingConstrainToolbarPosition(bool setting) {
2352 _constrainToolbarPosition.set(setting);2359 _constrainToolbarPosition.set(setting);
2353 DependencyManager::get<OffscreenUi>()->setConstrainToolbarToCenterX(setting);2360 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