History

Merge pull request #11793 from ElderOrb/FB9032

9032 - Current display mode can be deselected in the toolbar/tablet menu

Brad Hefta-Gaub committed 8 years ago

Commit e0700332 parents 6429b61 c4aa9375 files · +33 −57Browse files

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

Unified · Split

interface/src/Application.cpp+3−0
@@ -7089,6 +7089,7 @@ DisplayPluginPointer Application::getActiveDisplayPlugin() const { · 7088 unmodified lines
7089 return _displayPlugin;7089 return _displayPlugin;
7090}7090}
7091 7091
7092static const char* EXCLUSION_GROUP_KEY = "exclusionGroup";
7092 7093
7093static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {7094static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {
7094 auto menu = Menu::getInstance();7095 auto menu = Menu::getInstance();
@@ -7124,6 +7125,8 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti · 29 unmodified lines
7124 action->setCheckable(true);7125 action->setCheckable(true);
7125 action->setChecked(active);7126 action->setChecked(active);
7126 displayPluginGroup->addAction(action);7127 displayPluginGroup->addAction(action);
7128
7129 action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup));
7127 Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name));7130 Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name));
7128}7131}
7129 7132

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