From b76081e4fb9e70f8012ed83b47451b53e9731e5d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 25 Jan 2012 23:12:39 +0100
Subject: Access keys handling fixes

Stupid me, I forgot to merge a part from konqueror access keys
handling...
---
 src/webview.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/webview.cpp')

diff --git a/src/webview.cpp b/src/webview.cpp
index 558f52fc..850229d1 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -770,22 +770,21 @@ void WebView::keyReleaseEvent(QKeyEvent *event)
     // access keys management
     if (ReKonfig::accessKeysEnabled())
     {
-        m_accessKeysPressed = (event->key() == Qt::Key_Control);
+        if (m_accessKeysPressed && event->key() != Qt::Key_Control)
+            m_accessKeysPressed = false;
 
-        if (!m_accessKeysPressed)
+        if (m_accessKeysPressed && !(event->modifiers() & Qt::ControlModifier))
         {
-            if (checkForAccessKey(event))
-            {
-                hideAccessKeys();
-                event->accept();
-                return;
-            }
-            hideAccessKeys();
+            kDebug() << "Shotting access keys";
+            QTimer::singleShot(200, this, SLOT(accessKeyShortcut()));
+            event->accept();
+            return;
         }
         else
         {
-            kDebug() << "Shotting access keys";
-            QTimer::singleShot(200, this, SLOT(accessKeyShortcut()));
+            hideAccessKeys();
+            event->accept();
+            return;
         }
     }
 
-- 
cgit v1.2.1