From eeb37de6144853aefe4c93972f7f4a05f0e8dbf1 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Tue, 29 Jun 2021 22:49:28 +0800
Subject: [PATCH] Adjust margins

---
 qml/LauncherGridDelegate.qml | 14 ++++----------
 qml/LauncherGridView.qml     |  2 +-
 qml/main.qml                 |  7 +++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/qml/LauncherGridDelegate.qml b/qml/LauncherGridDelegate.qml
index ea10534..d6e3d43 100755
--- a/qml/LauncherGridDelegate.qml
+++ b/qml/LauncherGridDelegate.qml
@@ -57,16 +57,10 @@ Item {
     IconItem {
         id: icon
 
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            top: parent.top
-            bottom: label.top
-
-            leftMargin: root.maxSpacing * 2
-            rightMargin: root.maxSpacing * 2
-            topMargin: root.maxSpacing * 2
-            bottomMargin: root.maxSpacing * 2
-        }
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.bottom: label.top
+        anchors.margins: FishUI.Units.largeSpacing * 2
 
         width: height
         height: width
diff --git a/qml/LauncherGridView.qml b/qml/LauncherGridView.qml
index f551198..e82b7ea 100644
--- a/qml/LauncherGridView.qml
+++ b/qml/LauncherGridView.qml
@@ -25,7 +25,7 @@ import Cutefish.Launcher 1.0
 PageView {
     id: control
 
-    property int iconSize: 128 + root.maxSpacing * 2
+    property int iconSize: 128 + FishUI.Units.largeSpacing * 2
 
     property int cellWidth: {
         var extraWidth = calcExtraSpacing(iconSize, control.width)
diff --git a/qml/main.qml b/qml/main.qml
index 16ed1d1..a5fc937 100755
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -139,8 +139,7 @@ Item {
         id: mainLayout
         anchors.fill: parent
         anchors.leftMargin: launcher.screenAvailableRect ? launcher.screenAvailableRect.x : 0
-        // anchors.topMargin: launcher.screenAvailableRect ? launcher.screenAvailableRect.y + root.maxSpacing * 2 : 0
-        anchors.topMargin: launcher.screenRect.y + FishUI.Units.largeSpacing * 2
+        anchors.topMargin: launcher.screenAvailableRect ? launcher.screenAvailableRect.y : 0
         anchors.rightMargin: launcher.screenRect.width - (launcher.screenAvailableRect.x + launcher.screenAvailableRect.width)
         anchors.bottomMargin: launcher.screenRect.height - (launcher.screenAvailableRect.y + launcher.screenAvailableRect.height - root.verticalSpacing)
 
@@ -227,8 +226,8 @@ Item {
             LauncherGridView {
                 id: appView
                 anchors.fill: parent
-                anchors.leftMargin: gridItem.width * 0.07
-                anchors.rightMargin: gridItem.width * 0.07
+                anchors.leftMargin: gridItem.width * 0.1
+                anchors.rightMargin: gridItem.width * 0.1
                 Layout.alignment: Qt.AlignHCenter
                 focus: true