mtk6580: asteroid-launcher: Refresh patches.

Signed-off-by: Darrel Griët <[email protected]>
argosphil · Jun 11, 2023 · cc4fbcf · cc4fbcf
1 parent b895400
commit cc4fbcf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/...auncher/asteroid-launcher/0001-compositor-Fix-new-window-animation-on-screen-rotate.patch b/...auncher/asteroid-launcher/0001-compositor-Fix-new-window-animation-on-screen-rotate.patch
@@ -1,4 +1,4 @@
-From 2cf4afd5d48a42c497bca9704bd2ac1cb7ef4180 Mon Sep 17 00:00:00 2001
+From f50cea46d403b8beabc18bbe1b0d37816ff14a66 Mon Sep 17 00:00:00 2001
 From: Florent Revest <[email protected]>
 Date: Mon, 24 Sep 2018 01:17:41 +0200
 Subject: [PATCH] =?UTF-8?q?compositor:=20Fix=20new=20window=20animation=20?=
@@ -8,16 +8,16 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 ---
- qml/compositor/compositor.qml | 5 ++++-
+ src/qml/compositor/compositor.qml | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/qml/compositor/compositor.qml b/qml/compositor/compositor.qml
-index fee7280..93ae1de 100644
---- a/qml/compositor/compositor.qml
-+++ b/qml/compositor/compositor.qml
-@@ -222,7 +222,10 @@ Item {
-                 setCurrentWindow(homeWindow)
-             } else if (!isNotificationWindow && !isAgentWindow && !isDialogWindow) {
+diff --git a/src/qml/compositor/compositor.qml b/src/qml/compositor/compositor.qml
+index 8c738c6..6ea9148 100644
+--- a/src/qml/compositor/compositor.qml
++++ b/src/qml/compositor/compositor.qml
+@@ -236,7 +236,10 @@ Item {
+                 }
+                 parent.ready = false
                  w.smoothBorders = true
 -                w.x = width
 +                if(root.rotation == 0)

diff --git a/...auncher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch b/...auncher/asteroid-launcher/0002-GestureFilterArea-Fix-swipe-interaction-on-rotated-s.patch
@@ -1,16 +1,16 @@
-From 0c57cd1ae48c4aaddc27cf5684595fd7d35a121e Mon Sep 17 00:00:00 2001
+From a42df4e6f8f6391c48e53269646964ccfd617009 Mon Sep 17 00:00:00 2001
 From: Florent Revest <[email protected]>
 Date: Wed, 26 Jul 2017 22:27:37 +0100
 Subject: [PATCH] GestureFilterArea: Fix swipe interaction on rotated screens
 
 ---
- gesturefilterarea.cpp | 6 +++---
+ src/gesturefilterarea.cpp | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/gesturefilterarea.cpp b/gesturefilterarea.cpp
-index 88bbd87..8bb547f 100644
---- a/gesturefilterarea.cpp
-+++ b/gesturefilterarea.cpp
+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++;
@@ -20,9 +20,9 @@ index 88bbd87..8bb547f 100644
 +    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(m_velocityX > m_threshold) {
-             m_tracing = false;
-@@ -137,7 +137,7 @@ void GestureFilterArea::mouseMoveEvent(QMouseEvent *event) {
+         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();