From 11b96cd1729ee7666e1cc506e39c327a2b757225 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Sat, 21 Mar 2026 22:54:31 +0100
Subject: [PATCH] Fix GoodButtons alignment

---
 gui/ui/app.slint | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gui/ui/app.slint b/gui/ui/app.slint
index 0c02324..b3a4382 100644
--- a/gui/ui/app.slint
+++ b/gui/ui/app.slint
@@ -183,20 +183,22 @@ component GoodButtons inherits ScrollView {
     in property <int> button-height: 60;
     in property <int> button-spacing: 10;
 
-    property <int> count-x: floor(root.width / 1pt / (button-width + button-spacing));
+    property <int> count-x: max(1, floor(root.width / 1pt / (button-width + button-spacing)));
     property <int> count-y: ceil(favorites.length / count-x);
 
-    viewport-height: (count-y * (button-height + button-spacing)) * 1pt;
     mouse-drag-pan-enabled: true;
 
-    for item[idx] in favorites: Button {
-        x: floor(mod(idx, count-x)) * (root.button-width + root.button-spacing) * 1pt;
-        y: floor(idx / count-x) * (root.button-height + root.button-spacing) * 1pt;
-        width: root.button-width * 1pt;
-        height: root.button-height * 1pt;
-        text: item;
-        clicked => {
-            State.add-to-list(item);
+    GridBox {
+        for item[idx] in favorites: Button {
+            col: floor(mod(idx, count-x));
+            row: floor(idx / count-x);
+            min-width: 100pt;
+            min-height: 60pt;
+            max-height: 100pt;
+            text: item;
+            clicked => {
+                State.add-to-list(item);
+            }
         }
     }
 }