anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#7292 revert the use MetaModifier for AltModifier on mac - we have to look for a proper solution to make the keyboard navigation (Option-Arrow) and the input of accented characters possible. For now the working standard keyboard navigation has higher priority.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37707 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2011-02-17 07:49:16 +00:00
parent 9bebb8945d
commit 26e7593a8b
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/qt4/GuiKeySymbol.cpp
View File

@ -691,13 +691,8 @@ docstring const KeySymbol::print(KeyModifier mod, bool forgui) const
tmpkey += Qt::ShiftModifier;
if (mod & ControlModifier)
tmpkey += Qt::ControlModifier;
#ifdef Q_WS_MACX
if (mod & AltModifier)
tmpkey += Qt::MetaModifier;
#else
if (mod & AltModifier)
tmpkey += Qt::AltModifier;
#endif
QKeySequence seq(tmpkey);
QString str;
@ -749,13 +744,8 @@ KeyModifier q_key_state(Qt::KeyboardModifiers state)
k |= ControlModifier;
if (state & Qt::ShiftModifier)
k |= ShiftModifier;
#ifdef Q_WS_MACX
if (state & Qt::MetaModifier)
k |= AltModifier;
#else
if (state & Qt::AltModifier || state & Qt::MetaModifier)
k |= AltModifier;
#endif
return k;
}