diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-22 06:29:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-22 17:46:09 +0000 |
commit | ac98b6e4ea46835d01b4c8f35b566a92136c90fe (patch) | |
tree | 18230c81ef0139f9c3fed87f886566ec7fc5d628 /src/plugins/platforms/windows/qwindowsapplication.h | |
parent | 034427a45a0f220d6a7e38bac4c70cfd60b07982 (diff) |
Windows QPA: Move the touch types API from platformheaders into QtGui
Change TouchWindowTouchType(s) to be (global) property of
QGuiApplication's native Windows interface since it does not make
sense to set it per window.
It appears the previous code setting the types per Window has never
worked since registerTouchWindow() bailed out due to the checks for
the flags TouchRegistered and IsTouchWindow() (setting in
HCBT_CREATEWND). In addition, registering windows for touch after
plugging in a device would not observe the setting.
Move the checks around to make this work.
Task-number: QTBUG-41433
Task-number: QTBUG-48849
Task-number: QTBUG-83252
Change-Id: I4306fdf13208f6eef22655875f3bd1769270e617
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsapplication.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsapplication.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsapplication.h b/src/plugins/platforms/windows/qwindowsapplication.h index e68de31880..309fc7151f 100644 --- a/src/plugins/platforms/windows/qwindowsapplication.h +++ b/src/plugins/platforms/windows/qwindowsapplication.h @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QWindowsApplication : public QPlatformInterface::Private::QWindowsApplication { public: + void setTouchWindowTouchType(TouchWindowTouchTypes type) override; + TouchWindowTouchTypes touchWindowTouchType() const override; + WindowActivationBehavior windowActivationBehavior() const override; void setWindowActivationBehavior(WindowActivationBehavior behavior) override; @@ -57,6 +60,7 @@ public: private: WindowActivationBehavior m_windowActivationBehavior = DefaultActivateWindow; + TouchWindowTouchTypes m_touchWindowTouchTypes = NormalTouch; }; QT_END_NAMESPACE |