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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-11-22 09:11:51 +01:00
parent 759fd36a1e cf3a9b0192
commit 559e66cb35
105 changed files with 2534 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -784,6 +784,12 @@ static const QMap<QString, int> &vimKeyNames()
return k;
}
bool isControlModifier(const Qt::KeyboardModifiers &mods)
{
static const int ctrl = HostOsInfo::controlModifier();
return (mods & ctrl) == ctrl;
}
Range::Range()
: beginPos(-1), endPos(-1), rangemode(RangeCharMode)
@@ -938,12 +944,12 @@ public:
bool is(int c) const
{
return m_xkey == c && m_modifiers != HostOsInfo::controlModifier();
return m_xkey == c && !isControl();
}
bool isControl() const
{
return m_modifiers == HostOsInfo::controlModifier();
return isControlModifier(m_modifiers);
}
bool isControl(int c) const
@@ -2215,7 +2221,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
}
// We are interested in overriding most Ctrl key combinations.
if (mods == HostOsInfo::controlModifier()
if (isControlModifier(mods)
&& !config(ConfigPassControlKey).toBool()
&& ((key >= Key_A && key <= Key_Z && key != Key_K)
|| key == Key_BracketLeft || key == Key_BracketRight)) {