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

iOS: send mouse events (from touch events) from EAGLView

Browse Source 
Change-Id: Ia6c955f2c5bcde8e41d5908bfb8fd52bd449b3ec
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Richard Moe Gustavsen 2012-11-07 22:57:17 +01:00 committed by Tor Arne Vestbø
parent ea1e5ccd62
commit 0dbee6a5e1
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@
#import <UIKit/UIKit.h>
class QIOSContext;
class QIOSWindow;
@interface EAGLView : UIView <UIKeyInput>
{
@ -57,8 +58,10 @@ class QIOSContext;
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;

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

@ -58,6 +58,14 @@
return [CAEAGLLayer class];
}
-(id)initWithQIOSWindow:(QIOSWindow *)qioswindow
{
if (self = [super init]) {
m_qioswindow = qioswindow;
}
return self;
}
- (id)initWithFrame:(CGRect)frame
{
if ((self = [super initWithFrame:frame])) {
@ -83,22 +91,13 @@
- (void)sendMouseEventForTouches:(NSSet *)touches withEvent:(UIEvent *)event fakeButtons:(Qt::MouseButtons)buttons
{
Q_UNUSED(touches);
Q_UNUSED(event);
Q_UNUSED(buttons);
// FIXME: Reintroduce relation to UIWindow
qDebug() << __FUNCTION__ << "not implemented";
#if 0
UITouch *touch = [touches anyObject];
CGPoint locationInView = [touch locationInView:self];
CGFloat scaleFactor = [self contentScaleFactor];
QPoint p(locationInView.x * scaleFactor, locationInView.y * scaleFactor);
// TODO handle global touch point? for status bar?
QWindowSystemInterface::handleMouseEvent(m_window->window(), (ulong)(event.timestamp*1000), p, p, buttons);
#endif
QWindowSystemInterface::handleMouseEvent(m_qioswindow->window(), (ulong)(event.timestamp*1000), p, p, buttons);
}
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
@ -169,7 +168,7 @@ QT_BEGIN_NAMESPACE
QIOSWindow::QIOSWindow(QWindow *window)
: QPlatformWindow(window)
, m_view([[EAGLView alloc] init])
, m_view([[EAGLView alloc] initWithQIOSWindow:this])
{
UIApplication *uiApplication = [UIApplication sharedApplication];
if (uiApplication) {