From 165fa81da4a2ed9fa7346e8914aa0a07e76227d4 Mon Sep 17 00:00:00 2001
From: wackyideas <17151-wackyideas@users.noreply.gitgud.io>
Date: Mon, 12 Sep 2022 20:37:06 +0200
Subject: [PATCH] Fixes incorrect behaviour when using SevenTasks while it is
 configured to sort tasks manually.

Expected behaviour:

1. Dragging pinned tasks around should update their position correctly and keep that position permanently
2. Dragging items that are NOT tasks should focus the task that is being hovered over for easier drag and drop functionality

Actual behaviour:

1. Dragging pinned tasks around seemingly works, until the task manager is updated in any kind of way, at which point the positions are reverted back to the original state.
2. Dragging items that aren't tasks will only focus the hovered task if previous dragging actions didn't occur between two or more tasks. After that, trying to drag items onto the taskbar will cause the task that was dragged last time to move around according to the mouse's position.
---
 .../contents/ui/.Task.qml.kate-swp               | Bin 0 -> 138 bytes
 .../contents/ui/.main.qml.kate-swp               | Bin 0 -> 814 bytes
 .../contents/ui/MouseHandler.qml                 |  15 +++++++++++----
 .../contents/ui/Task.qml                         |  10 ++++++++--
 .../seventasks_src/build/install_manifest.txt    |   2 --
 .../src/package/contents/ui/MouseHandler.qml     |  15 +++++++++++----
 .../src/package/contents/ui/Task.qml             |  10 ++++++++--
 7 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp
 create mode 100644 Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp

diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..bc94aed272a66dce10e408f9bc283e63396856e8
GIT binary patch
literal 138
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn@n%pzJn41KHq$v)kNSL<E_vy8+AlZ=
yC=(CFAixUZ#DSR%3>+X%ER^F6;>18XP9RP+l%o&|WW<ArI1mvFB4R*9v?~B8*%%`L

literal 0
HcmV?d00001

diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..b36ba379b2f294565aa00aa83548c99108eed8a4
GIT binary patch
literal 814
zcmZwFIZne+5P;#AD<HEaERQ9S05K4D5+S890@1}1P$5~uMFfE;3kWJ&8V*3u1*oWV
z7brOc?~kx%uyA94p2crQHpUE{MBUhi_fg9pHm+k^_ScLtUiISU{Q0z>fA7E4zDp0i
zw~wdS@XVOZr;8pOyN56Lz~$M0t{_ZOJeQK`iidF|9>E>)D83Sp;ktMnx5QZ-2Vvda
zI1<hYNzY35pxR|8ryEqOZn@uXNqhpU(@tVF%~UFX8n>mt#lCn3H^j48^_#=$eDk;|
z`FUIuFQn=haY5n*tiD&o#UPZ7CElnLF5{lWSFqYp313Rw$7(~XSWU#=q$gU(M^azL
sx8e<aC*DleZ(+6JZLH?m!D`}N{3!kQu-foGRvW9}KO3s@rs8(?17CA~j{pDw

literal 0
HcmV?d00001

diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml
index a4593b5..7337907 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml	
@@ -18,6 +18,7 @@ Item {
     property Item target
     property Item ignoredItem
     property bool moved: false
+    property bool isGroupDialog: false
 
     property alias hoveredItem: dropHandler.hoveredItem
     property alias handleWheelEvents: wheelHandler.active
@@ -65,12 +66,17 @@ Item {
                 return;
             }
 
-            var above = target.childAt(event.x, event.y);
+            //var above = target.childAt(event.x, event.y);
+            let above;
+            if (isGroupDialog) {
+                above = target.itemAt(event.x, event.y);
+            } else {
+                above = target.childAt(event.x, event.y);
+            }
 
             if (!above) {
                 hoveredItem = null;
                 activationTimer.stop();
-
                 return;
             }
 
@@ -101,9 +107,9 @@ Item {
                 var insertAt = TaskTools.insertIndexAt(above, event.x, event.y);
 
                 if (tasks.dragSource !== above && tasks.dragSource.itemIndex !== insertAt) {
-                    if (groupDialog.visible && groupDialog.visualParent) {
+                    if (!!tasks.groupDialog) {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt,
-                            tasksModel.makeModelIndex(groupDialog.visualParent.itemIndex));
+                            tasksModel.makeModelIndex(tasks.groupDialog.visualParent.itemIndex));
                     } else {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt);
                     }
@@ -115,6 +121,7 @@ Item {
                 hoveredItem = above;
                 activationTimer.restart();
             }
+            tasksModel.syncLaunchers();
         }
 
         onDragLeave: {
diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml
index 526bb09..9ce7aa0 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml	
@@ -151,9 +151,10 @@ MouseArea {
             }
         } else {
             pressed = false;
+            //if(!ma.pressed) tasks.dragSource = null;
         }
 	hoverEnabled = true;
-        
+
     }
 
     onPressed: {
@@ -216,13 +217,14 @@ MouseArea {
         pressX = -1;
         pressY = -1;
 	hoverEnabled = true;
+
     }
     
     onPressAndHold: {
     }
     onPositionChanged: { //hoverEnabled: true, but this event still doesn't fire at all
                          //unless i am pressing the left mouse button for a short period of time
-        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) { 
+        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
             
             tasks.dragSource = task;
             dragHelper.startDrag(task, model.MimeType, model.MimeData,
@@ -231,6 +233,10 @@ MouseArea {
             pressY = -1;
             return;
         }
+        else
+        {
+            tasks.dragSource = null;
+        }
         
         //code for dragging the task around
         
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt
index 378479c..04380cb 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt	
@@ -23,8 +23,6 @@
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ToolTipInstance.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ToolTipWindowMouseArea.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/main.qml
-/usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/MenuBackend.qml
-/usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ContextMenuBackend.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/metadata.desktop
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/metadata.json
 /usr/share/metainfo/org.kde.plasma.seventasks.appdata.xml
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml
index a4593b5..7337907 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml	
@@ -18,6 +18,7 @@ Item {
     property Item target
     property Item ignoredItem
     property bool moved: false
+    property bool isGroupDialog: false
 
     property alias hoveredItem: dropHandler.hoveredItem
     property alias handleWheelEvents: wheelHandler.active
@@ -65,12 +66,17 @@ Item {
                 return;
             }
 
-            var above = target.childAt(event.x, event.y);
+            //var above = target.childAt(event.x, event.y);
+            let above;
+            if (isGroupDialog) {
+                above = target.itemAt(event.x, event.y);
+            } else {
+                above = target.childAt(event.x, event.y);
+            }
 
             if (!above) {
                 hoveredItem = null;
                 activationTimer.stop();
-
                 return;
             }
 
@@ -101,9 +107,9 @@ Item {
                 var insertAt = TaskTools.insertIndexAt(above, event.x, event.y);
 
                 if (tasks.dragSource !== above && tasks.dragSource.itemIndex !== insertAt) {
-                    if (groupDialog.visible && groupDialog.visualParent) {
+                    if (!!tasks.groupDialog) {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt,
-                            tasksModel.makeModelIndex(groupDialog.visualParent.itemIndex));
+                            tasksModel.makeModelIndex(tasks.groupDialog.visualParent.itemIndex));
                     } else {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt);
                     }
@@ -115,6 +121,7 @@ Item {
                 hoveredItem = above;
                 activationTimer.restart();
             }
+            tasksModel.syncLaunchers();
         }
 
         onDragLeave: {
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml
index 526bb09..9ce7aa0 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml	
@@ -151,9 +151,10 @@ MouseArea {
             }
         } else {
             pressed = false;
+            //if(!ma.pressed) tasks.dragSource = null;
         }
 	hoverEnabled = true;
-        
+
     }
 
     onPressed: {
@@ -216,13 +217,14 @@ MouseArea {
         pressX = -1;
         pressY = -1;
 	hoverEnabled = true;
+
     }
     
     onPressAndHold: {
     }
     onPositionChanged: { //hoverEnabled: true, but this event still doesn't fire at all
                          //unless i am pressing the left mouse button for a short period of time
-        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) { 
+        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
             
             tasks.dragSource = task;
             dragHelper.startDrag(task, model.MimeType, model.MimeData,
@@ -231,6 +233,10 @@ MouseArea {
             pressY = -1;
             return;
         }
+        else
+        {
+            tasks.dragSource = null;
+        }
         
         //code for dragging the task around