summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2013-01-15 13:22:01 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:56:04 +0100
commite83bed82c1b58cde1f9a49ad4e4b86d8a13304f1 (patch)
treede5bb0f56e9050021d66a868a34ed2cdd9a610f7 /src/plugins
parent355f064ec97cf61c7041a6d32f198a6bde800e6e (diff)
iOS: raise windows that becomes visible
When a QWindow becomes visible, it should move to front and be active. Change-Id: Icab12c6031c0cc8d791e4f8cc49b9c2d5c73100d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/ios/qioswindow.mm10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 5bb5048b0a..488962ab66 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -264,7 +264,15 @@ void QIOSWindow::setVisible(bool visible)
QPlatformWindow::setVisible(visible);
m_view.hidden = !visible;
- if (isQtApplication() && !visible) {
+ if (!isQtApplication())
+ return;
+
+ // Since iOS doesn't do window management the way a Qt application
+ // expects, we need to raise and activate windows ourselves:
+ if (visible) {
+ raise();
+ QWindowSystemInterface::handleWindowActivated(window());
+ } else {
// Activate top-most visible QWindow:
NSArray *subviews = rootViewController().view.subviews;
for (int i = int(subviews.count) - 1; i >= 0; --i) {