Re: [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events.

From: Denys Dmytriyenko <denys@ti.com>
To: "Franklin S. Cooper Jr" <fcooper@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events.
Date: Thu, 4 Sep 2014 13:45:58 -0400	[thread overview]
Message-ID: <20140904174558.GN18620@edge> (raw)
In-Reply-To: <1409852140-13616-1-git-send-email-fcooper@ti.com>

Franklin,

Thanks! Have you tested these patches? Are there any other touch/qt5/weston 
issues remaining? What about that Weston restart one?

On Thu, Sep 04, 2014 at 12:35:38PM -0500, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> * This is another QtWayland bug that was discussed in the Qt bug report:
>   https://bugreports.qt-project.org/browse/QTBUG-36602
> * Patch link:
>     https://codereview.qt-project.org/#/c/93664/
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../0001-Wayland-correct-touch-location.patch      |   31 ++++++++++++++++++++
>  .../recipes-qt/qt5/qtwayland_git.bbappend          |    5 ++--
>  2 files changed, 34 insertions(+), 2 deletions(-)
>  create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
> 
> diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
> new file mode 100644
> index 0000000..caa6dff
> --- /dev/null
> +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
> @@ -0,0 +1,31 @@
> +From ae54be549e6ebeef829d5c1089d5307d00d0b791 Mon Sep 17 00:00:00 2001
> +From: Shawn Rutledge <shawn.rutledge@digia.com>
> +Date: Mon, 1 Sep 2014 15:30:42 +0200
> +Subject: [PATCH] Wayland: correct touch location
> +
> +The window margins were offsetting the touch point in the wrong
> +direction.
> +
> +Task-number: QTBUG-36602
> +Change-Id: Id8b31d2de4051f36d3ff4e088bbc9bd7cc84ca13
> +Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
> +---
> + src/client/qwaylandinputdevice.cpp |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
> +index 4a100f7..014303f 100644
> +--- a/src/client/qwaylandinputdevice.cpp
> ++++ b/src/client/qwaylandinputdevice.cpp
> +@@ -921,7 +921,7 @@ void QWaylandInputDevice::handleTouchPoint(int id, double x, double y, Qt::Touch
> + 
> +         tp.area = QRectF(0, 0, 8, 8);
> +         QMargins margins = win->frameMargins();
> +-        tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x+margins.left(), y+margins.top())));
> ++        tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x - margins.left(), y - margins.top())));
> +     }
> + 
> +     tp.state = state;
> +-- 
> +1.7.9.5
> +
> diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
> index dca1710..336484b 100644
> --- a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
> +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
> @@ -1,8 +1,9 @@
> -PR_append = "-arago2"
> +PR_append = "-arago3"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
> -SRC_URI += "file://0001-Fix-touch-with-Weston.patch"
> +SRC_URI += "file://0001-Fix-touch-with-Weston.patch \
> +            file://0001-Wayland-correct-touch-location.patch"
>  
>  
>  QT_MODULE_BRANCH = "5.4"
> -- 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago