diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-11-11 16:33:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-14 19:26:20 +0100 |
| commit | 18182a6275bb353dfb67ebc1562649e7624ccb0c (patch) | |
| tree | 72c3947502b4fbfb956eb3e9fcb8f69ae164b9c5 /src/plugins/platforms/ios | |
| parent | e6eadd6f61ae38a49a6bb355c02532cad2aacf4e (diff) | |
iOS: Handle key window as part of QWindow activation
The default UIWindow may not be the only UIWindow around in a multi
screen setup.
Change-Id: Ia7243190321a1416e577634bf5e010dd67d482e6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/qiosapplicationdelegate.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosapplicationdelegate.mm b/src/plugins/platforms/ios/qiosapplicationdelegate.mm index e06d2b8840..def6d2ff04 100644 --- a/src/plugins/platforms/ios/qiosapplicationdelegate.mm +++ b/src/plugins/platforms/ios/qiosapplicationdelegate.mm @@ -64,7 +64,7 @@ self.window.backgroundColor = [UIColor cyanColor]; #endif - [self.window makeKeyAndVisible]; + self.window.hidden = NO; return YES; } diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 6d7b793f0b..23e6ad82b5 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -456,6 +456,8 @@ void QIOSWindow::requestActivateWindow() if (!window()->isTopLevel() || blockedByModal()) return; + [m_view.window makeKeyWindow]; + raise(); QPlatformInputContext *context = QGuiApplicationPrivate::platformIntegration()->inputContext(); static_cast<QIOSInputContext *>(context)->focusViewChanged(m_view); |