diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 6220ea2e1fe9b11aa54b34cd96dcef3d059c7bab..e78f9141a86c612b228d6fc405bd5bc3d45c58f6 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -687,6 +687,13 @@ void QQuickWindowPrivate::translateTouchEvent(QTouchEvent *touchEvent) touchEvent->setTouchPoints(touchPoints); } + +static inline bool windowHasFocus(QQuickWindow *win) +{ + const QWindow *focusWindow = QGuiApplication::focusWindow(); + return win == focusWindow || QQuickRenderControl::renderWindowFor(win) == focusWindow; +} + /*! Set the focus inside \a scope to be \a item. If the scope contains the active focus item, it will be changed to \a item. @@ -762,7 +769,7 @@ void QQuickWindowPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, Q } if (!(options & DontChangeFocusProperty)) { - if (item != contentItem || QGuiApplication::focusWindow() == q) { + if (item != contentItem || windowHasFocus(q)) { itemPrivate->focus = true; changed << item; } diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index e20e5f22ab04c9a7c3e17d53fc8766f1b0cebe7a..7e31c271f4dfa7d590a2b6766ba454edb07ebec6 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -941,6 +941,20 @@ void QQuickWidget::wheelEvent(QWheelEvent *e) } #endif + +void QQuickWidget::focusInEvent(QFocusEvent * event) +{ + Q_D(QQuickWidget); + d->offscreenWindow->focusInEvent(event); +} + +void QQuickWidget::focusOutEvent(QFocusEvent * event) +{ + Q_D(QQuickWidget); + d->offscreenWindow->focusOutEvent(event); +} + + /*! \reimp */ bool QQuickWidget::event(QEvent *e) { diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h index 81e9af02fb0cecf46b1da042417a1618afd5a48d..4287933063f18b6ff0e88ca1efcd63be8c10b3e1 100644 --- a/src/quickwidgets/qquickwidget.h +++ b/src/quickwidgets/qquickwidget.h @@ -120,6 +120,9 @@ protected: virtual void showEvent(QShowEvent *); virtual void hideEvent(QHideEvent *); + virtual void focusInEvent(QFocusEvent * event); + virtual void focusOutEvent(QFocusEvent * event); + #ifndef QT_NO_WHEELEVENT virtual void wheelEvent(QWheelEvent *); #endif