summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsintegration.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-02-26 15:02:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-27 13:28:23 +0100
commitcebdd91f8bbebf43fd2ec3c4dd2f49f46172d47e (patch)
tree3f5a2401b2fabdfcaa7a7c9c2b09055bb35bdc8f /src/plugins/platforms/windows/qwindowsintegration.cpp
parentbbc4cc4a47bb96c8cb85b6f0dd607020e74f3e2c (diff)
Windows: Add platform plugin parameter for tablet absolute range.
Make the range for detecting relative (mouse mode) configureable using -platform windows:tabletabsoluterange=50 Task-number: QTBUG-36937 Change-Id: I44f928e53cb41b246c44554ec7f71bfbdf03c147 Reviewed-by: Arthur Krebsbach <Arthur.Krebsbach@Wacom.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index e5d9444966..3735865845 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -143,7 +143,7 @@ struct QWindowsIntegrationPrivate
explicit QWindowsIntegrationPrivate(const QStringList &paramList);
~QWindowsIntegrationPrivate();
- const unsigned m_options;
+ unsigned m_options;
QWindowsContext m_context;
QPlatformFontDatabase *m_fontDatabase;
#ifndef QT_NO_CLIPBOARD
@@ -165,7 +165,8 @@ struct QWindowsIntegrationPrivate
QWindowsServices m_services;
};
-static inline unsigned parseOptions(const QStringList &paramList)
+static inline unsigned parseOptions(const QStringList &paramList,
+ int *tabletAbsoluteRange)
{
unsigned options = 0;
foreach (const QString &param, paramList) {
@@ -187,15 +188,21 @@ static inline unsigned parseOptions(const QStringList &paramList)
options |= QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch;
} else if (param.startsWith(QLatin1String("verbose="))) {
QWindowsContext::verbose = param.right(param.size() - 8).toInt();
+ } else if (param.startsWith(QLatin1String("tabletabsoluterange="))) {
+ *tabletAbsoluteRange = param.rightRef(param.size() - 20).toInt();
}
}
return options;
}
QWindowsIntegrationPrivate::QWindowsIntegrationPrivate(const QStringList &paramList)
- : m_options(parseOptions(paramList))
+ : m_options(0)
, m_fontDatabase(0)
{
+ int tabletAbsoluteRange = -1;
+ m_options = parseOptions(paramList, &tabletAbsoluteRange);
+ if (tabletAbsoluteRange >= 0)
+ m_context.setTabletAbsoluteRange(tabletAbsoluteRange);
}
QWindowsIntegrationPrivate::~QWindowsIntegrationPrivate()