summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoawindow.h
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2013-01-24 11:24:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 19:22:01 +0100
commit03d057ff01332333b98f5298c3d0bd85b5604ac9 (patch)
tree2f0922111950af7e5335f48dbc6e3ae58d2522b9 /src/plugins/platforms/cocoa/qcocoawindow.h
parentb2c73c73cd0a68aae0586cf447c2612c13aeb52c (diff)
Cocoa: Make touch events work again.
Bring back the ref-counted enable on enter/leave workaround we had in Qt 4: If any widget in a window sets WA_AcceptTouchEvents then that window will start processing touch events. Enabling touch events has implications for delivery of other events, for example by causing scrolling event lag. Change-Id: I307488937f417612eff624bf9892b82a7f69c1b7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 5029321247..e1de5f0add 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -147,6 +147,8 @@ public:
void setMenubar(QCocoaMenuBar *mb);
QCocoaMenuBar *menubar() const;
+ void registerTouch(bool enable);
+
qreal devicePixelRatio() const;
void exposeWindow();
void obscureWindow();
@@ -187,6 +189,7 @@ public: // for QNSView
bool m_hasModalSession;
bool m_frameStrutEventsEnabled;
bool m_isExposed;
+ int m_registerTouchCount;
};
QT_END_NAMESPACE