AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Rename QIOSWindow's backing view from EAGLView to QUIView

Browse Source 
Matches the cocoa QNSView and highlights the relation to UIView.

Change-Id: Idcdb17bff994c1e0aef099400c21915a7041e44c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-11-07 12:20:28 +01:00 committed by The Qt Project
parent a301e868f7
commit 24d1f58414
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/ios/qioswindow.h
View File

@ -56,6 +56,8 @@ class QIOSWindow;
QT_BEGIN_NAMESPACE
@class QUIView;
class QIOSWindow : public QPlatformWindow
{
public:
@ -81,7 +83,7 @@ public:
WId winId() const { return WId(m_view); };
private:
UIView *m_view;
QUIView *m_view;
QRect m_normalGeometry;
int m_windowLevel;

12
src/plugins/platforms/ios/qioswindow.mm
View File

@ -58,7 +58,7 @@
#include <QtDebug>
@interface EAGLView : UIView <UIKeyInput>
@interface QUIView : UIView <UIKeyInput>
{
@public
UITextAutocapitalizationType autocapitalizationType;
@ -83,7 +83,7 @@
@end
@implementation EAGLView
@implementation QUIView
+ (Class)layerClass
{
@ -305,8 +305,8 @@
- (QWindow *)qwindow
{
if ([self isKindOfClass:[EAGLView class]])
return static_cast<EAGLView *>(self)->m_qioswindow->window();
if ([self isKindOfClass:[QUIView class]])
return static_cast<QUIView *>(self)->m_qioswindow->window();
return nil;
}
@ -316,7 +316,7 @@ QT_BEGIN_NAMESPACE
QIOSWindow::QIOSWindow(QWindow *window)
: QPlatformWindow(window)
, m_view([[EAGLView alloc] initWithQIOSWindow:this])
, m_view([[QUIView alloc] initWithQIOSWindow:this])
, m_normalGeometry(QPlatformWindow::geometry())
, m_windowLevel(0)
, m_devicePixelRatio(1.0)
@ -392,7 +392,7 @@ void QIOSWindow::setGeometry(const QRect &rect)
// Since we don't support transformations on the UIView, we can set the frame
// directly and let UIKit deal with translating that into bounds and center.
// Changing the size of the view will end up in a call to -[EAGLView layoutSubviews]
// Changing the size of the view will end up in a call to -[QUIView layoutSubviews]
// which will update QWindowSystemInterface with the new size.
m_view.frame = toCGRect(rect);
}