From 34f1eff1259a621f1b6edc48283532112544cb4b Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sat, 26 Dec 2020 19:39:11 +0200
Subject: [PATCH] remove separator length based on latte setting

---
 .../contents/ui/applet/HiddenSpacer.qml       | 21 +------------------
 declarativeimports/core/environment.h         |  2 +-
 .../package/contents/ui/task/HiddenSpacer.qml |  2 +-
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/containment/package/contents/ui/applet/HiddenSpacer.qml b/containment/package/contents/ui/applet/HiddenSpacer.qml
index 2a0a9973b..e13f78dc8 100644
--- a/containment/package/contents/ui/applet/HiddenSpacer.qml
+++ b/containment/package/contents/ui/applet/HiddenSpacer.qml
@@ -34,8 +34,7 @@ Item{
 
     property bool neighbourSeparator: rightSpacer ? appletItem.headAppletIsSeparator : appletItem.tailAppletIsSeparator
 
-    property int separatorSpace: neighbourSeparator && !appletItem.isSeparator && appletItem.parabolic.isEnabled
-                                 && !appletItem.latteApplet ? ((LatteCore.Environment.separatorLength/2)+appletItem.metrics.margin.length) : subtrackedMargins
+    property int separatorSpace: neighbourSeparator && appletItem.parabolic.isEnabled ? LatteCore.WindowSystem.separatorLength / 2 : 0
 
     property real nHiddenSize: {
         if (isSeparator || !communicator.requires.lengthMarginsEnabled) {
@@ -47,24 +46,6 @@ Item{
 
     property bool rightSpacer: false
 
-    readonly property bool atEdgeForcingFittsLaw: !isSeparator && !parabolicEffectMarginsEnabled && atScreenEdge
-    readonly property int subtrackedMargins: {
-        if (atEdgeForcingFittsLaw && !appletItem.isAutoFillApplet) {
-            var inJustifyStart = (root.inFullJustify && firstChildOfStartLayout && rightSpacer);
-            var inJustifyEnd = (root.inFullJustify && lastChildOfEndLayout && !rightSpacer);
-
-            var singleApplet = firstChildOfMainLayout && lastChildOfMainLayout;
-            var inSideStart = ((root.panelAlignment === LatteCore.Types.Left || root.panelAlignment === LatteCore.Types.Top) && firstChildOfMainLayout && rightSpacer);
-            var inSideEnd = ((root.panelAlignment === LatteCore.Types.Right || root.panelAlignment === LatteCore.Types.Bottom) && lastChildOfMainLayout && !rightSpacer);
-
-            if (inJustifyStart || inJustifyEnd || inSideStart || inSideEnd) {
-                return (wrapper.edgeLengthMarginsDisabled ? appletItem.metrics.margin.length + appletItem.lengthAppletPadding : appletItem.metrics.margin.length);
-            }
-        }
-
-        return 0;
-    }
-
     property real nScale: 0
 
     Behavior on nHiddenSize {
diff --git a/declarativeimports/core/environment.h b/declarativeimports/core/environment.h
index 3e12a861f..58a6e803a 100644
--- a/declarativeimports/core/environment.h
+++ b/declarativeimports/core/environment.h
@@ -42,7 +42,7 @@ class Environment final: public QObject
     Q_PROPERTY(uint plasmaDesktopVersion READ plasmaDesktopVersion NOTIFY plasmaDesktopVersionChanged)
 
 public:
-    static const int SeparatorLength = 6;
+    static const int SeparatorLength = 5;
 
     explicit Environment(QObject *parent = nullptr);
 
diff --git a/plasmoid/package/contents/ui/task/HiddenSpacer.qml b/plasmoid/package/contents/ui/task/HiddenSpacer.qml
index b103b213d..a0aac18ed 100644
--- a/plasmoid/package/contents/ui/task/HiddenSpacer.qml
+++ b/plasmoid/package/contents/ui/task/HiddenSpacer.qml
@@ -47,7 +47,7 @@ Item{
     //! && !root.inActivityChange (deprecated) in order to check if it is fixed
     property int separatorSpace: neighbourSeparator && !isSeparator && taskItem.parabolic.isEnabled
                                  && !(taskItem.indexer.separators.length>0 && root.dragSource) ?
-                                     ((LatteCore.Environment.separatorLength/2)+taskItem.metrics.margin.length) : 0
+                                     (LatteCore.Environment.separatorLength/2) : 0
 
     property bool rightSpacer: false