From 035fcb31189e35f10d14e18b6e1dd3c19cabc1bf Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Tue, 1 Sep 2015 17:35:01 +0530
Subject: [PATCH] If more space is available for icons show bigger

Also fix text size on tablet-ish form factor
---
 containments/homescreen/package/contents/ui/AppletsArea.qml   | 2 +-
 containments/homescreen/package/contents/ui/HomeLauncher.qml  | 2 +-
 .../homescreen/package/contents/ui/HomeLauncherSvg.qml        | 2 +-
 containments/homescreen/package/contents/ui/main.qml          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml
index 06611a90..90e72f57 100644
--- a/containments/homescreen/package/contents/ui/AppletsArea.qml
+++ b/containments/homescreen/package/contents/ui/AppletsArea.qml
@@ -224,7 +224,7 @@ MouseEventListener {
             flow: GridView.FlowTopToBottom
 
             cellWidth: root.width / 4
-            cellHeight: units.iconSizes.huge
+            cellHeight: root.buttonHeight
 
             model: plasmoid.nativeInterface.applicationListModel
             delegate: HomeLauncher {
diff --git a/containments/homescreen/package/contents/ui/HomeLauncher.qml b/containments/homescreen/package/contents/ui/HomeLauncher.qml
index b520da56..6d257ba5 100644
--- a/containments/homescreen/package/contents/ui/HomeLauncher.qml
+++ b/containments/homescreen/package/contents/ui/HomeLauncher.qml
@@ -48,7 +48,7 @@ Item {
         maximumLineCount: 2
 
         text: modelData.ApplicationNameRole
-        font.pixelSize: theme.smallestFont.pixelSize
+        font.pixelSize: theme.defaultFont.pixelSize
         color: PlasmaCore.ColorScope.textColor
     }
 }
diff --git a/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml b/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
index 7725c087..4b9e1909 100644
--- a/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
+++ b/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
@@ -4,7 +4,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 Item {
     id: root
     width: parent.width / parent.columns
-    height: units.iconSizes.huge
+    height: root.buttonHeight
     property var callback
     property string text
     property string sub
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index f7f49901..98f765de 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -34,7 +34,7 @@ Item {
 //BEGIN properties
     property Item toolBox
     property alias appletsSpace: applicationsView.headerItem
-    property int buttonHeight: units.iconSizes.huge
+    property int buttonHeight: (Math.floor(height / units.iconSizes.huge) > 6) ? units.iconSizes.enormous : units.iconSizes.huge
     property bool reorderingApps: false
     property bool locked: applicationsView.contentY < -applicationsView.headerItem.height + plasmoid.availableScreenRect.height
     property var layoutManager: LayoutManager
@@ -469,7 +469,7 @@ Item {
                 property var dragData
 
                 cellWidth: root.width / 4
-                cellHeight: units.iconSizes.huge
+                cellHeight: root.buttonHeight
                 model: plasmoid.nativeInterface.applicationListModel
 
                 snapMode: GridView.SnapToRow