[vlc-commits] Leave minimal interface if Esc key was pressed

[Tobias Güntner]

vlc/vlc-2.0 | branch: master | Tobias Güntner <fatbull at web.de> | Wed Feb  1 23:46:59 2012 +0100| [632b91a9ac91501d35d8aa590d02f5f1c24d45d6] | committer: Jean-Baptiste Kempf

Leave minimal interface if Esc key was pressed

Close #5898

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 6e3489732966f4b124b4d68a53988b593c08777b)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=632b91a9ac91501d35d8aa590d02f5f1c24d45d6
---

 modules/gui/qt4/main_interface.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index b3633e1..6285502 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1302,7 +1302,8 @@ void MainInterface::keyPressEvent( QKeyEvent *e )
 
 void MainInterface::handleKeyPress( QKeyEvent *e )
 {
-    if( ( e->modifiers() &  Qt::ControlModifier ) && ( e->key() == Qt::Key_H ) )
+    if( ( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() == Qt::Key_H ) ) ||
+        ( b_minimalView && !b_videoFullScreen && e->key() == Qt::Key_Escape ) )
     {
         toggleMinimalView( !b_minimalView );
         e->accept();