feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix ambiguous shortcut problems

Browse Source 
The dummy shortcut eater did not always work, we sometimes do have
mutual exclusive shortcuts in the same context.

The current solution is simpler: ignore text input when the control modifier
is used. This seems to be in line with other toolkits and applications.

Done with: thorbjorn
This commit is contained in:
mae
2009-12-16 12:12:35 +01:00
parent 29051539ef
commit 3bb71243d4
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -425,11 +425,8 @@ QKeySequence Action::keySequence() const
OverrideableAction::OverrideableAction(int id)
: Action(id), m_currentAction(0), m_active(false),
m_contextInitialized(false),
m_dummyShortcutEater(this)
m_contextInitialized(false)
{
Core::ICore::instance()->mainWindow()->addAction(&m_dummyShortcutEater);
m_dummyShortcutEater.setEnabled(false);
}
void OverrideableAction::setAction(QAction *action)
@@ -473,7 +470,6 @@ bool OverrideableAction::setCurrentContext(const QList<int> &context)
if (hasAttribute(CA_Hide))
m_action->setVisible(false);
m_action->setEnabled(false);
m_dummyShortcutEater.setEnabled(false);
m_active = false;
return false;
}
@@ -527,9 +523,6 @@ void OverrideableAction::actionChanged()
m_action->setEnabled(m_currentAction->isEnabled());
m_action->setVisible(m_currentAction->isVisible());
m_dummyShortcutEater.setShortcuts(m_action->shortcuts());
m_dummyShortcutEater.setEnabled(m_action->isVisible() && !m_action->isEnabled());
}
bool OverrideableAction::isActive() const