From 12098a1ea27941ca5326776e6e1fecaaf84af91a Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Tue, 4 Jan 2022 01:31:17 +0200
Subject: [PATCH] dragging:respect placeholder in length fill calcs

--reduce glitches when dragging applets around and there
are also fillLength applets in Justify alignment
---
 .../privates/layouter/AppletsContainer.qml    | 29 ++++++++++---------
 .../package/contents/ui/applet/AppletItem.qml |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/containment/package/contents/ui/abilities/privates/layouter/AppletsContainer.qml b/containment/package/contents/ui/abilities/privates/layouter/AppletsContainer.qml
index 51ca1fa04..6145477a0 100644
--- a/containment/package/contents/ui/abilities/privates/layouter/AppletsContainer.qml
+++ b/containment/package/contents/ui/abilities/privates/layouter/AppletsContainer.qml
@@ -40,11 +40,9 @@ Item {
         value: {
             var space = 0;
             for (var i=0; i<grid.children.length; ++i){
-                if (grid.children[i]
-                        && !grid.children[i].isAutoFillApplet
-                        && !grid.children[i].isHidden) {
+                if (grid.children[i] && (grid.children[i].isPlaceHolder || (!grid.children[i].isAutoFillApplet && !grid.children[i].isHidden))) {
 
-                    if (grid.children[i].isInternalViewSplitter) {
+                    if (!grid.children[i].isPlaceHolder && grid.children[i].isInternalViewSplitter) {
                         space += root.maxJustifySplitterSize;
                     } else {
                         space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height;
@@ -64,9 +62,7 @@ Item {
         value: {
             var space = 0;
             for (var i=0; i<grid.children.length; ++i){
-                if (grid.children[i]
-                        && !grid.children[i].isInternalViewSplitter
-                        && !grid.children[i].isHidden) {
+                if (grid.children[i] && (grid.children[i].isPlaceHolder || (!grid.children[i].isInternalViewSplitter && !grid.children[i].isHidden))) {
                     space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height;
                 }
             }
@@ -86,7 +82,7 @@ Item {
             for (var i=0; i<grid.children.length; ++i){
                 if (grid.children[i] && grid.children[i].isHidden) {
                     //do nothing
-                } else if (grid.children[i] && grid.children[i].applet){/*internal splitters are ignored this way*/
+                } else if (grid.children[i] && (grid.children[i].isPlaceHolder || grid.children[i].applet)){/*internal splitters are ignored this way*/
                     res = res + 1;
                 }
             }
@@ -103,7 +99,10 @@ Item {
         value: {
             var no = 0;
             for (var i=0; i<grid.children.length; ++i){
-                if (grid.children[i] && grid.children[i].isAutoFillApplet && !grid.children[i].isHidden) {
+                if (grid.children[i]
+                        && !grid.children[i].isPlaceHolder
+                        && grid.children[i].isAutoFillApplet
+                        && !grid.children[i].isHidden) {
                     //console.log("fill :::: " + children[i].applet.pluginName);
                     no++;
                 }
@@ -120,7 +119,11 @@ Item {
         value: {
             var no = 0;
             for (var i=0; i<grid.children.length; ++i){
-                if (grid.children[i] && grid.children[i].isRequestingFill && grid.children[i].applet && !grid.children[i].isHidden) {
+                if (grid.children[i]
+                        && !grid.children[i].isPlaceHolder
+                        && grid.children[i].isRequestingFill
+                        && grid.children[i].applet
+                        && !grid.children[i].isHidden) {
                     //console.log("fill :::: " + children[i].applet.pluginName);
                     no++;
                 }
@@ -179,9 +182,9 @@ Item {
 
             for (var i=0; i<grid.children.length; ++i){
                 if (grid.children[i]
-                        && grid.children[i].isPlaceHolder
-                        || (grid.children[i].isInternalViewSplitter
-                            && !grid.children[i].isHidden)) {
+                        && !grid.children[i].isPlaceHolder
+                        && grid.children[i].isInternalViewSplitter
+                        && !grid.children[i].isHidden) {
                     intsSplits = intsSplits + 1;
                 }
             }
diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index fcb591499..25e9711d5 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -94,6 +94,7 @@ Item {
                             && ((applet && applet.status === PlasmaCore.Types.HiddenStatus ) || isInternalViewSplitter)
     property bool isInternalViewSplitter: (internalSplitterId > 0)
     property bool isZoomed: false
+    property bool isPlaceHolder: false
     property bool isPressed: viewSignalsConnector.pressed
     property bool isSeparator: applet && (applet.pluginName === "audoban.applet.separator"
                                           || applet.pluginName === "org.kde.latte.separator")