From 5b77af489e2686941c3ccded0482418291f07a58 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 30 Aug 2019 16:14:34 +0200
Subject: [PATCH] grid as big as icons

---
 .../package/contents/ui/launcher/LauncherGrid.qml    |  1 +
 .../homescreen2/package/contents/ui/main.qml         | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml b/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
index 6f0e55c8..bec651ce 100644
--- a/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
+++ b/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
@@ -32,6 +32,7 @@ import org.kde.phone.homescreen 1.0
 LauncherContainer {
     id: root
 
+    readonly property int columns: Math.floor(root.flow.width / cellWidth)
     readonly property int cellWidth: root.flow.width / Math.floor(root.flow.width / ((availableCellHeight - reservedSpaceForLabel) + units.smallSpacing*4))
     readonly property int cellHeight: availableCellHeight
 
diff --git a/containments/homescreen2/package/contents/ui/main.qml b/containments/homescreen2/package/contents/ui/main.qml
index eee671ca..7b0691b0 100644
--- a/containments/homescreen2/package/contents/ui/main.qml
+++ b/containments/homescreen2/package/contents/ui/main.qml
@@ -157,6 +157,7 @@ Item {
         PlasmaComponents.ScrollBar.vertical: PlasmaComponents.ScrollBar {
             id: scrollabr
             opacity: mainFlickable.moving
+            interactive: false
             Behavior on opacity {
                 OpacityAnimator {
                     duration: units.longDuration * 2
@@ -229,6 +230,9 @@ Item {
 
                     anchors.fill: parent
 
+                    cellWidth: Math.floor(width / launcher.columns)
+                    cellHeight: launcher.cellHeight
+
                     configKey: width > height ? "ItemGeometriesHorizontal" : "ItemGeometriesVertical"
                     containment: plasmoid
                     editModeCondition: plasmoid.immutable
@@ -244,8 +248,8 @@ Item {
                     defaultItemWidth: units.gridUnit * 6
                     defaultItemHeight: defaultItemWidth
 
-                    cellWidth: units.iconSizes.small
-                    cellHeight: cellWidth
+                    //cellWidth: units.iconSizes.small
+                    //cellHeight: cellWidth
 
                     acceptsAppletCallback: function(applet, x, y) {
                         print("Applet: "+applet+" "+x+" "+y)
@@ -257,10 +261,10 @@ Item {
                         configOverlayComponent: ConfigOverlay {}
 
                         onEditModeChanged: {
-                            launcherDragManager.active = editMode;
+                            launcherDragManager.active = dragActive || editMode;
                         }
                         onDragActiveChanged: {
-                            launcherDragManager.active = dragActive;
+                            launcherDragManager.active = dragActive || editMode;
                         }
                     }