From 2c7d38a55c5f6b568e3d56b12d82b44a186058e0 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Mon, 14 Feb 2011 19:41:23 +0000 Subject: [PATCH] #7292 use MetaModifier for AltModifier on mac - alt is used to reach many special symbols, now they are usable for regular text input. Note: with swapped Command/Ctrl keys Ctrl is the MetaModifier. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37659 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiKeySymbol.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/frontends/qt4/GuiKeySymbol.cpp b/src/frontends/qt4/GuiKeySymbol.cpp index 1a945c08a6..870d269d52 100644 --- a/src/frontends/qt4/GuiKeySymbol.cpp +++ b/src/frontends/qt4/GuiKeySymbol.cpp @@ -691,8 +691,13 @@ 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; @@ -744,8 +749,13 @@ 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; } -- 2.39.5