diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2015-01-16 17:56:47 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-01-23 03:05:16 +0100 |
commit | ed950a8ec194eb35a1035c417aa99de7d38b433d (patch) | |
tree | 7d5a98877e1952e438d9f90d79c4d95ecd34df14 | |
parent | cc0a114cd6653acedead994c0df83aa448a6f753 (diff) |
iOS: Simplify QIOSWindow::setParent()
Change-Id: I78c47c6ccdb53045f3fa412b1489e08691d3e195
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
-rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 6c4614408d..0b09e73a7d 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -250,17 +250,10 @@ void QIOSWindow::setWindowState(Qt::WindowState state) void QIOSWindow::setParent(const QPlatformWindow *parentWindow) { - if (parentWindow) { - UIView *parentView = reinterpret_cast<UIView *>(parentWindow->winId()); - [parentView addSubview:m_view]; - } else if (isQtApplication()) { - for (UIWindow *uiWindow in [[UIApplication sharedApplication] windows]) { - if (uiWindow.screen == static_cast<QIOSScreen *>(screen())->uiScreen()) { - [uiWindow.rootViewController.view addSubview:m_view]; - break; - } - } - } + UIView *parentView = parentWindow ? reinterpret_cast<UIView *>(parentWindow->winId()) + : isQtApplication() ? static_cast<QIOSScreen *>(screen())->uiWindow().rootViewController.view : 0; + + [parentView addSubview:m_view]; } void QIOSWindow::requestActivateWindow() |