Override shortcuts only when an HTML input field has focus

Otherwise an application shortcut like Shift+Delete would no longer
work when webengine has focus (e.g. "delete mail" in KMail)

This removes unconditional calls to editorActionForKeyEvent for
ShortcutOverride event handling. We can remove those, because the key
sequences that are checked by editorActionForKeyEvent are a subset of
the key sequences checked by isCommonTextEditShortcut.

This amends commit 3902b27e.

Change-Id: I12a98368381edef36f11457c8b864d843efb871a
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 749a2e0d8..b6069d519 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -240,14 +240,8 @@ void RenderWidgetHostViewQtDelegateQuick::inputMethodStateChanged(bool editorVis
 
 bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event)
 {
-    if (event->type() == QEvent::ShortcutOverride) {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-        if (m_client->handleShortcutOverrideEvent(keyEvent))
-            return true;
-        if (editorActionForKeyEvent(keyEvent) != QQuickWebEngineView::NoWebAction)
-            event->accept();
-        return true;
-    }
+    if (event->type() == QEvent::ShortcutOverride)
+        return m_client->handleShortcutOverrideEvent(static_cast<QKeyEvent *>(event));
 
     if (event->type() == QEvent::NativeGesture)
         return m_client->forwardEvent(event);