diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-11-15 19:33:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-20 14:10:18 +0100 |
| commit | c3e949ac7dd9ddfc3c089061908000c5b4d9dc4c (patch) | |
| tree | a54baf06776d9bb58237bc8a3dcf9ec7f7b3675d /src/plugins/platforms/ios/qioswindow.mm | |
| parent | 837228151d085264e8244969349b3d68d6f9cc94 (diff) | |
iOS: Allow non-top-level windows to be activated
As tested and assumed by tst_QWindow::isActive().
Change-Id: I8d09263ce0acc9c3390a70b4089396257197a1be
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index b13ce456a4..de56084848 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -484,12 +484,14 @@ void QIOSWindow::requestActivateWindow() // Note that several windows can be active at the same time if they exist in the same // hierarchy (transient children). But only one window can be QGuiApplication::focusWindow(). // Dispite the name, 'requestActivateWindow' means raise and transfer focus to the window: - if (!window()->isTopLevel() || blockedByModal()) + if (blockedByModal()) return; [m_view.window makeKeyWindow]; - raise(); + if (window()->isTopLevel()) + raise(); + QPlatformInputContext *context = QGuiApplicationPrivate::platformIntegration()->inputContext(); static_cast<QIOSInputContext *>(context)->focusViewChanged(m_view); QWindowSystemInterface::handleWindowActivated(window()); |