diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-27 15:41:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-27 18:09:43 +0000 |
| commit | 50097aaa44d68fec1213ab4a23cc2b740ec00ad9 (patch) | |
| tree | e417730c643edec707f1727ca3e04baf5ab29a90 | |
| parent | b1ad21ca04906f6652a7be8290c910a4790a7e39 (diff) | |
| parent | c220203787f7b30d69d9102165dc5d09bc2ac5b6 (diff) | |
| download | qtquickcontrols-50097aaa44d68fec1213ab4a23cc2b740ec00ad9.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
| -rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 7 | ||||
| -rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 8d821d84..670ad6aa 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -148,6 +148,13 @@ void QQuickMenuPopupWindow::updatePosition() setGeometry(newPos.x(), newPos.y(), width(), height()); } +void QQuickMenuPopupWindow::focusInEvent(QFocusEvent *e) +{ + QQuickWindow::focusInEvent(e); + if (m_menu && m_menu->menuContentItem()) + m_menu->menuContentItem()->forceActiveFocus(); +} + void QQuickMenuPopupWindow::exposeEvent(QExposeEvent *e) { // the popup will reposition at the last moment, so its diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 5cff75af..abee1f83 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -68,6 +68,7 @@ Q_SIGNALS: void willBeDeletedLater(); protected: + void focusInEvent(QFocusEvent *); void exposeEvent(QExposeEvent *); bool shouldForwardEventAfterDismiss(QMouseEvent *) const; |