From 5691d8d8ce0300b55e0bf380a83e357bd504f64a Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 15 May 2008 09:42:28 +0000
Subject: [PATCH] - Don't popup the menubar if only Alt is pressed. - add a
 FIXME wrt LyX own shortcuts using Alt.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24786 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiView.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 3c4b710e17..c6312ea4b8 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -641,15 +641,20 @@ bool GuiView::event(QEvent * e)
 	}
 
 	case QEvent::ShortcutOverride: {
-		QKeyEvent * ke = static_cast<QKeyEvent*>(e);
 
-		if (ke->modifiers() & Qt::AltModifier && isFullScreen()
-			&& menuBar()->isHidden()) {
-				menuBar()->show();
+		if (isFullScreen() && menuBar()->isHidden()) {
+			QKeyEvent * ke = static_cast<QKeyEvent*>(e);
+			// FIXME: we should also try to detect special LyX shortcut such as
+			// Alt-P and Alt-M
+			if (!(ke->modifiers() & Qt::AltModifier)
+				|| ke->key() == Qt::Key_Alt)
+				return QMainWindow::event(e);			
+			menuBar()->show();
 			// Continue with even.
 			return QMainWindow::event(e);
 		}
 
+		QKeyEvent * ke = static_cast<QKeyEvent*>(e);
 		if (d.current_work_area_)
 			// Nothing special to do.
 			return QMainWindow::event(e);