#7292 make the modifiers Option and Control act on there own on mac - adjust the...

[features.git] / src / frontends / qt4 / GuiWorkArea.cpp

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 4ac179a226f641e5f7b69b36590da6d28ae124b7..796df43d056e7660273754025390c7b4475c5649 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -721,7 +721,10 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
                QAbstractScrollArea::contextMenuEvent(e);
                return;
        }
-       QMenu * menu = guiApp->menus().menu(toqstr(name), *lyx_view_);
+       // always show mnemonics when the keyboard is used to show the context menu
+       // FIXME: This should be fixed in Qt itself
+       bool const keyboard = (e->reason() == QContextMenuEvent::Keyboard);
+       QMenu * menu = guiApp->menus().menu(toqstr(name), *lyx_view_, keyboard);
        if (!menu) {
                QAbstractScrollArea::contextMenuEvent(e);
                return;
@@ -1006,8 +1009,21 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
        }
 #endif
 
+       KeyModifier m = q_key_state(ev->modifiers());
+
+       std::string str;
+       if (m & ShiftModifier)
+               str += "Shift-";
+       if (m & ControlModifier)
+               str += "Control-";
+       if (m & AltModifier)
+               str += "Alt-";
+       if (m & MetaModifier)
+               str += "Meta-";
+       
        LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
-               << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key());
+               << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key()
+               << " keyState: " << str);
 
        KeySymbol sym;
        setKeySymbol(&sym, ev);