summaryrefslogtreecommitdiff
path: root/src/wcmCommon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/wcmCommon.c')
-rw-r--r--src/wcmCommon.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 02f3da1..8bf1ebb 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1180,6 +1180,8 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel,
{
if (IsPen(priv))
{
+ common->wcmTouchDevice->common->wcmPenInProx = filtered.proximity;
+
/* send touch out when pen coming in-prox for devices
* that provideboth pen and touch events so system
* cursor won't jump between tools.
@@ -1196,9 +1198,6 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel,
return;
}
- if (IsPen(priv))
- common->wcmPenInProx = filtered.proximity;
-
if ((IsPen(priv) || IsTouch(priv)) && common->wcmMaxZ)
{
priv->minPressure = rebasePressure(priv, &filtered);