History

merge with master

HifiExperiments committed 7 years ago

Commit 97b91792 parents 6060077 1569c40501 files · +21594 −6864Browse files

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

Unified · Split

interface/src/Menu.cpp+7−2
@@ -267,8 +267,13 @@ Menu::Menu() { · 266 unmodified lines
267267 // Settings > Graphics...
268268 action = addActionToQMenuAndActionHash(settingsMenu, "Graphics...");
269269 connect(action, &QAction::triggered, [] {
270− qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
271− QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
270+ auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
271+ auto hmd = DependencyManager::get<HMDScriptingInterface>();
272+ tablet->pushOntoStack("hifi/dialogs/graphics/GraphicsSettings.qml");
273+
274+ if (!hmd->getShouldShowTablet()) {
275+ hmd->toggleShouldShowTablet();
276+ }
272277 });
273278
274279 // Settings > Security...

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