From ad5286279f16068225dbb7319621da2bc50b2f27 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Fri, 25 Jan 2019 17:36:15 +0200
Subject: [PATCH] rename properties appropriately in containment

---
 containment/package/contents/ui/DebugWindow.qml       | 4 ++--
 containment/package/contents/ui/PanelBox.qml          | 8 ++++----
 containment/package/contents/ui/VisibilityManager.qml | 4 ++--
 containment/package/contents/ui/main.qml              | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/containment/package/contents/ui/DebugWindow.qml b/containment/package/contents/ui/DebugWindow.qml
index f8e0197b2..0557a0023 100644
--- a/containment/package/contents/ui/DebugWindow.qml
+++ b/containment/package/contents/ui/DebugWindow.qml
@@ -541,11 +541,11 @@ Window{
             }
 
             Text{
-                text: "Panel Background Margin"+space
+                text: "Panel Thickness Margin High"+space
             }
 
             Text{
-                text: root.panelMargin
+                text: root.panelThickMarginHigh
             }
 
             Text{
diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml
index 87646d3ac..0800e0de3 100644
--- a/containment/package/contents/ui/PanelBox.qml
+++ b/containment/package/contents/ui/PanelBox.qml
@@ -206,11 +206,11 @@ Item{
                 return root.statesLineSize + root.iconSize + root.thickMargin;
             } else {
                 var icons = root.statesLineSize + root.iconSize + root.thickMargin + 1;
-                var panels = root.themePanelSize + root.panelMargin;
+                var panelt = root.themePanelThickness + root.panelThickMarginHigh;
 
                 root.realPanelThickness = icons;
-                if (icons > panels) {
-                    return panels;
+                if (icons > panelt) {
+                    return panelt;
                 } else {
                     return icons;
                 }
@@ -452,7 +452,7 @@ Item{
 
             Binding {
                 target: root
-                property: "panelMargin"
+                property: "panelThickMarginHigh"
                 value: {
                     if (root.useThemePanel){
                         if (root.isVertical){
diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index 7300942ec..4608bcad0 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -39,7 +39,7 @@ Item{
     property bool inForceHiding: false //is used when the docks are forced in hiding e.g. when changing layouts
     property bool normalState : false  // this is being set from updateMaskArea
     property bool previousNormalState : false // this is only for debugging purposes
-    property bool panelIsBiggerFromIconSize: root.useThemePanel && (root.themePanelSize >= root.iconSize)
+    property bool panelIsBiggerFromIconSize: root.useThemePanel && (root.themePanelThickness >= root.iconSize)
 
     property int animationSpeed: Latte.WindowSystem.compositingActive ? root.durationTime * 1.2 * units.longDuration : 0
     property bool inSlidingIn: false //necessary because of its init structure
@@ -181,7 +181,7 @@ Item{
     Connections{
         target:root
         onPanelShadowChanged: updateMaskArea();
-        onPanelMarginChanged: updateMaskArea();
+        onPanelThickMarginHighChanged: updateMaskArea();
     }
 
     Connections{
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 487fbe593..5751c29a1 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -283,7 +283,8 @@ DragDrop.DropArea {
     property int realPanelLength: 0
     property int realPanelThickness: 0
     //this is set by the PanelBox
-    property int panelMargin: 0
+    property int panelThickMarginBase: 0
+    property int panelThickMarginHigh: 0
     property int panelMarginLength: 0
     property int panelShadow: 0 //shadowsSize
     property int editShadow: {
@@ -296,9 +297,9 @@ DragDrop.DropArea {
         }
     }
 
-    property int themePanelSize: {
+    property int themePanelThickness: {
         //root.statesLineSize + root.iconSize + root.iconMargin + 1
-        var panelBase = root.statesLineSize + root.panelMargin;
+        var panelBase = root.statesLineSize + root.panelThickMarginHigh;
         var margin = latteApplet ? thickMargin : 0;
         var maxPanelSize = (root.statesLineSize + iconSize + margin + 1) - panelBase;
         var percentage = Latte.WindowSystem.compositingActive ? plasmoid.configuration.panelSize/100 : 1;