whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: make EAGLView private in QIOSWindow 

Not the biggest gain, but since all the members of EAGLView are
declared private, we might as well move the whole interface into
the source file. We can then make the members public without
caring about interface readability. We will make use of this in
a following patch.

Change-Id: I144fb5748573ca6faf257d72597907b5c17b1e05
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
bb10
Richard Moe Gustavsen 2012-12-19 10:46:22 +01:00 committed by Tor Arne Vestbø
parent 2dea9fdc3a
commit bbb8db9bdb
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,31 +49,6 @@
class QIOSContext;
class QIOSWindow;
@interface EAGLView : UIView <UIKeyInput>
{
UITextAutocapitalizationType autocapitalizationType;
UITextAutocorrectionType autocorrectionType;
BOOL enablesReturnKeyAutomatically;
UIKeyboardAppearance keyboardAppearance;
UIKeyboardType keyboardType;
UIReturnKeyType returnKeyType;
BOOL secureTextEntry;
QIOSWindow *m_qioswindow;
}
- (id)initWithQIOSWindow:(QIOSWindow *)qioswindow;
- (void)sendMouseEventForTouches:(NSSet *)touches withEvent:(UIEvent *)event fakeButtons:(Qt::MouseButtons)buttons;
@property(nonatomic) UITextAutocapitalizationType autocapitalizationType;
@property(nonatomic) UITextAutocorrectionType autocorrectionType;
@property(nonatomic) BOOL enablesReturnKeyAutomatically;
@property(nonatomic) UIKeyboardAppearance keyboardAppearance;
@property(nonatomic) UIKeyboardType keyboardType;
@property(nonatomic) UIReturnKeyType returnKeyType;
@property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry;
@end
QT_BEGIN_NAMESPACE
class QIOSWindow : public QPlatformWindow
@ -92,10 +67,10 @@ public:
GLuint colorRenderbuffer(const QIOSContext &context) const;
qreal devicePixelRatio() const;
EAGLView *nativeView() const { return m_view; }
UIView *nativeView() const { return m_view; }
private:
EAGLView *m_view;
UIView *m_view;
QRect m_requestedGeometry;
mutable struct GLData {

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

@ -53,6 +53,29 @@
#include <QtDebug>
@interface EAGLView : UIView <UIKeyInput>
{
@public
UITextAutocapitalizationType autocapitalizationType;
UITextAutocorrectionType autocorrectionType;
BOOL enablesReturnKeyAutomatically;
UIKeyboardAppearance keyboardAppearance;
UIKeyboardType keyboardType;
UIReturnKeyType returnKeyType;
BOOL secureTextEntry;
QIOSWindow *m_qioswindow;
}
@property(nonatomic) UITextAutocapitalizationType autocapitalizationType;
@property(nonatomic) UITextAutocorrectionType autocorrectionType;
@property(nonatomic) BOOL enablesReturnKeyAutomatically;
@property(nonatomic) UIKeyboardAppearance keyboardAppearance;
@property(nonatomic) UIKeyboardType keyboardType;
@property(nonatomic) UIReturnKeyType returnKeyType;
@property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry;
@end
@implementation EAGLView
+ (Class)layerClass
@ -186,7 +209,6 @@
@end
QT_BEGIN_NAMESPACE
QIOSWindow::QIOSWindow(QWindow *window)