diff options
author | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-08-29 18:35:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-30 17:33:17 +0000 |
commit | 2209add7a5b019afef7830d8bbf416fbb2a2ecf5 (patch) | |
tree | a48a19e5bccdc96618f6ada123546c088233a42b | |
parent | 3ddbb2cc3e74e3803c1a36a38715b93b88a3e16d (diff) |
Clicking on a select box option, did not work
There was introcuded a new logic which proves that
no mouse / keyboard events are forwarded to
Chromium if the view has no focus, and activeFocusOnPress is set to false.
The selection box get focus when the user click on it,
but the popup window never get (focus is on QuickRootItem)
in this case these mouse events are ignored to forward to Chromium.
Task-number: QTBUG-54795
Change-Id: Id6e81ee39dcde21a6c5c46e302888b9e9478352f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 6 |
1 files changed, 3 insertions, 3 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 e198e5e0d..290f3f9b0 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -234,7 +234,7 @@ void RenderWidgetHostViewQtDelegateQuick::mousePressEvent(QMouseEvent *event) QQuickItem *parent = parentItem(); if (!m_isPopup && (parent && parent->property("activeFocusOnPress").toBool())) forceActiveFocus(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } @@ -254,7 +254,7 @@ void RenderWidgetHostViewQtDelegateQuick::mouseMoveEvent(QMouseEvent *event) void RenderWidgetHostViewQtDelegateQuick::mouseReleaseEvent(QMouseEvent *event) { QQuickItem *parent = parentItem(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } @@ -292,7 +292,7 @@ void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event) void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event) { QQuickItem *parent = parentItem(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } |