From ab78cea2c722f17790341cf21f469f2b30b67063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darrel=20Gri=C3=ABt?= Date: Thu, 5 Oct 2023 22:30:33 +0200 Subject: [PATCH] mtk6580: asteroid-launcher: Remove GestureFilterArea rotation handling patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/AsteroidOS/asteroid-launcher/commit/ae378b1694401b1d7bd4428dc7ecf3511be3ef55 has been implemented which means that local positioning is used instead of window positioning. This means that no special handling for rotation is needed anymore. Signed-off-by: Darrel Griët --- ...a-Fix-swipe-interaction-on-rotated-s.patch | 33 ------------------- .../asteroid-launcher_%.bbappend | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch diff --git a/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch b/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch deleted file mode 100644 index 36d6af55..00000000 --- a/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a42df4e6f8f6391c48e53269646964ccfd617009 Mon Sep 17 00:00:00 2001 -From: Florent Revest -Date: Wed, 26 Jul 2017 22:27:37 +0100 -Subject: [PATCH] GestureFilterArea: Fix swipe interaction on rotated screens - ---- - src/gesturefilterarea.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/gesturefilterarea.cpp b/src/gesturefilterarea.cpp -index fb6162f..5e95f2c 100644 ---- a/src/gesturefilterarea.cpp -+++ b/src/gesturefilterarea.cpp -@@ -94,8 +94,8 @@ void GestureFilterArea::mouseMoveEvent(QMouseEvent *event) { - } - m_counter++; - -- m_velocityX = (m_velocityX*(m_counter-1) + (event->windowPos().x()-m_prevPos.x()))/m_counter; -- m_velocityY = (m_velocityY*(m_counter-1) + (event->windowPos().y()-m_prevPos.y()))/m_counter; -+ m_velocityX = (m_velocityX*(m_counter-1) + -((event->windowPos().x()-m_prevPos.x()))/m_counter); -+ m_velocityY = (m_velocityY*(m_counter-1) + -((event->windowPos().y()-m_prevPos.y()))/m_counter); - if(m_tracing) { - if (abs(m_velocityX) > abs(m_velocityY)) { - if(m_velocityX > m_threshold) { -@@ -141,7 +141,7 @@ void GestureFilterArea::mouseMoveEvent(QMouseEvent *event) { - else - delta = event->windowPos().y() - m_prevPos.y(); - -- emit swipeMoved(m_horizontal, delta); -+ emit swipeMoved(m_horizontal, -delta); - } - m_prevPos = event->windowPos(); - } diff --git a/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher_%.bbappend b/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher_%.bbappend index 2fc4a060..adec81e9 100644 --- a/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher_%.bbappend +++ b/meta-mtk6580/recipes-asteroid/asteroid-launcher/asteroid-launcher_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS:prepend:harmony := "${THISDIR}/asteroid-launcher:" -SRC_URI:append:harmony = " file://0001-compositor-Fix-new-window-animation-on-screen-rotate.patch \ - file://0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch" +SRC_URI:append:harmony = " file://0001-compositor-Fix-new-window-animation-on-screen-rotate.patch"