summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-11-08 15:09:00 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:55:40 +0100
commit3bc6d7470a88bf1da12aa768c9527fe08d52757a (patch)
tree0d3679797c0e57f1c762cec37094e2452078249a /src
parent231796c98d317f845209e2b470fa34e00aac3c7a (diff)
iOS: Pass QWindow geometry to initWithFrame on window creation
Allows the optimal pattern of setting the geometry of the QWindow before showing (and hence creating) it. Change-Id: I29206b5d9a70df0b01e8df8f7df8f35cced51121 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/ios/qioswindow.mm13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 59508d83f3..ce0ea6e0e1 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -51,6 +51,11 @@
#include <QtDebug>
+static CGRect toCGRect(const QRect &rect)
+{
+ return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
@implementation EAGLView
+ (Class)layerClass
@@ -58,11 +63,11 @@
return [CAEAGLLayer class];
}
--(id)initWithQIOSWindow:(QIOSWindow *)qioswindow
+-(id)initWithQIOSWindow:(QIOSWindow *)window
{
- if (self = [super init]) {
- m_qioswindow = qioswindow;
- }
+ if (self = [super initWithFrame:toCGRect(window->geometry())])
+ m_qioswindow = window;
+
return self;
}