From 73229c5fbcc48c5a2f7ea98e9a992fea9b76d5df Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 11 Feb 2018 02:04:21 +0200
Subject: [PATCH] give some more space in editingVisual for ruler

---
 app/dock/dockconfigview.cpp                   |  4 +--
 app/dock/docksecconfigview.cpp                |  2 +-
 .../package/contents/ui/EditModeVisual.qml    | 13 +++-------
 .../package/contents/ui/VisibilityManager.qml |  4 +--
 containment/package/contents/ui/main.qml      | 26 +++++++++++++++++++
 5 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp
index 05f15ca06..81967b015 100644
--- a/app/dock/dockconfigview.cpp
+++ b/app/dock/dockconfigview.cpp
@@ -202,9 +202,7 @@ void DockConfigView::syncGeometry()
     const auto location = m_dockView->containment()->location();
     const auto sGeometry = screen()->geometry();
 
-    int clearThickness = m_dockView->normalThickness();
-
-    int secondaryConfigSpacing = 2 * m_largeSpacing;
+    int clearThickness = m_dockView->normalThickness() + m_largeSpacing;
 
     QPoint position{0, 0};
 
diff --git a/app/dock/docksecconfigview.cpp b/app/dock/docksecconfigview.cpp
index 6065d1117..3f5f315a4 100644
--- a/app/dock/docksecconfigview.cpp
+++ b/app/dock/docksecconfigview.cpp
@@ -149,7 +149,7 @@ void DockSecConfigView::syncGeometry()
     const auto location = m_dockView->containment()->location();
     const auto sGeometry = screen()->geometry();
 
-    int clearThickness = m_dockView->normalThickness();
+    int clearThickness = m_dockView->normalThickness() + m_largeSpacing;
 
     int secondaryConfigSpacing = 2 * m_largeSpacing;
 
diff --git a/containment/package/contents/ui/EditModeVisual.qml b/containment/package/contents/ui/EditModeVisual.qml
index 5009de78b..b393218d8 100644
--- a/containment/package/contents/ui/EditModeVisual.qml
+++ b/containment/package/contents/ui/EditModeVisual.qml
@@ -28,14 +28,14 @@ import org.kde.latte 0.1 as Latte
 
 Item{
     id: editVisual
-    width: root.isHorizontal ? editLength : visibilityManager.thicknessNormalOriginal
-    height: root.isVertical ? editLength : visibilityManager.thicknessNormalOriginal
+    width: root.isHorizontal ? editLength : visibilityManager.thicknessNormalOriginal + theme.defaultFont.pixelSize
+    height: root.isVertical ? editLength : visibilityManager.thicknessNormalOriginal + theme.defaultFont.pixelSize
 
     opacity: 0
 
     property int speed: root.durationTime*2.8*units.longDuration
     property int thickness: visibilityManager.thicknessNormalOriginal + root.editShadow
-    property int rootThickness: visibilityManager.thicknessZoomOriginal + root.editShadow
+    property int rootThickness: visibilityManager.thicknessZoomOriginal + root.editShadow - theme.defaultFont.pixelSize
     property int editLength: root.isHorizontal ? (root.behaveAsPlasmaPanel ? root.width - root.maxIconSize/4 : root.width)://root.maxLength) :
                                                  (root.behaveAsPlasmaPanel ? root.height - root.maxIconSize/4 : root.height)
 
@@ -125,13 +125,6 @@ Item{
         source: "../icons/"+editVisual.layoutColor+"print.jpg"
     }
 
-    Ruler{
-        width: root.maxLength
-        anchors.topMargin: 0.2*theme.defaultFont.pixelSize
-        anchors.top: parent.top
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
     /*Behavior on width {
         NumberAnimation { duration: 300 }
         enabled: root.isHorizontal
diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index e7edc155d..737035399 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -339,8 +339,8 @@ Item{
 
                 //this is used to fix a bug with shadow showing when the animation of edit mode
                 //is triggered
-                tempThickness = editModeVisual.editAnimationEnded ? thicknessNormalOriginal + root.editShadow :
-                                                                    thicknessNormalOriginal
+                tempThickness = editModeVisual.editAnimationEnded ? thicknessNormalOriginal + theme.defaultFont.pixelSize + root.editShadow :
+                                                                    thicknessNormalOriginal + theme.defaultFont.pixelSize
 
                 if (dock.visibility.isHidden && !slidingAnimationAutoHiddenOut.running ) {
                     tempThickness = thicknessAutoHidden;
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 8e314f18c..97f065346 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -1471,6 +1471,8 @@ DragDrop.DropArea {
     }
 
     Item{
+        id: panelBox
+
         anchors.fill:layoutsContainer
         z: root.behaveAsPlasmaPanel ? 0 : 1
 
@@ -1528,6 +1530,30 @@ DragDrop.DropArea {
 
     LayoutsContainer { id: layoutsContainer }
 
+    Ruler{
+        width: behaveAsPlasmaPanel ? panelBox.width : root.maxLength
+        anchors.top: editModeVisual.top
+        anchors.topMargin: 0.2*theme.defaultFont.pixelSize
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        opacity: root.editMode && plasmoid.configuration.advanced ? 1 : 0
+
+        z: 15
+
+        Behavior on width {
+            NumberAnimation {
+                duration: 4 * container.animationTime
+                easing.type: Easing.OutCubic
+            }
+        }
+
+        Behavior on opacity {
+            NumberAnimation {
+                duration: 4 * container.animationTime
+                easing.type: Easing.OutCubic
+            }
+        }
+    }
 
     ///////////////END UI elements