From 40fd920eb3fccafc83511207bf6b2eb239dc7885 Mon Sep 17 00:00:00 2001
From: BieHDC <do@not.redeem>
Date: Sat, 26 Oct 2024 22:17:02 +0200
Subject: [PATCH] Add Option to CheckGroup to make Rows/Columns

This is fully backwards compatible and helps with very
long lists to be better organised.
---
 widget/check_group.go | 77 +++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/widget/check_group.go b/widget/check_group.go
index e2725b35ed..4d5710de3b 100644
--- a/widget/check_group.go
+++ b/widget/check_group.go
@@ -1,6 +1,7 @@
 package widget
 
 import (
+	"math"
 	"strings"
 
 	"fyne.io/fyne/v2"
@@ -15,6 +16,7 @@ import (
 type CheckGroup struct {
 	DisableableWidget
 	Horizontal bool
+	numColumns int
 	Required   bool
 	OnChanged  func([]string) `json:"-"`
 	Options    []string
@@ -30,14 +32,22 @@ var _ fyne.Widget = (*CheckGroup)(nil)
 // Since: 2.1
 func NewCheckGroup(options []string, changed func([]string)) *CheckGroup {
 	r := &CheckGroup{
-		Options:   options,
-		OnChanged: changed,
+		Options:    options,
+		OnChanged:  changed,
+		numColumns: 1,
 	}
 	r.ExtendBaseWidget(r)
 	r.update()
 	return r
 }
 
+func (r *CheckGroup) SetColumns(columns int) {
+	if columns < 1 {
+		columns = 1
+	}
+	r.numColumns = columns
+}
+
 // Append adds a new option to the end of a CheckGroup widget.
 func (r *CheckGroup) Append(option string) {
 	r.Options = append(r.Options, option)
@@ -181,29 +191,58 @@ type checkGroupRenderer struct {
 
 // Layout the components of the checks widget
 func (r *checkGroupRenderer) Layout(_ fyne.Size) {
-	count := 1
+	count := float32(1)
 	if len(r.items) > 0 {
-		count = len(r.items)
+		count = float32(len(r.items))
 	}
+
 	var itemHeight, itemWidth float32
 	minSize := r.checks.MinSize()
+	numColumns := float32(r.checks.numColumns)
 	if r.checks.Horizontal {
-		itemHeight = minSize.Height
-		itemWidth = minSize.Width / float32(count)
+		itemHeight = minSize.Height / numColumns
+		itemWidth = numColumns * (minSize.Width / count)
 	} else {
-		itemHeight = minSize.Height / float32(count)
-		itemWidth = minSize.Width
+		itemHeight = numColumns * (minSize.Height / count)
+		itemWidth = minSize.Width / numColumns
 	}
 
 	itemSize := fyne.NewSize(itemWidth, itemHeight)
-	x, y := float32(0), float32(0)
-	for _, item := range r.items {
-		item.Resize(itemSize)
-		item.Move(fyne.NewPos(x, y))
+
+	ritemslen := len(r.items)
+	chunksize := int(math.Ceil(float64((float32(ritemslen) / numColumns))))
+	if chunksize < 1 {
+		chunksize = 1
+	}
+	var j int
+	var offset float32
+	for i := 0; i < ritemslen; i += chunksize {
+		j += chunksize
+		if j > ritemslen {
+			j = ritemslen
+		}
+
+		x, y := float32(0), float32(0)
+		if r.checks.Horizontal {
+			y = offset
+		} else {
+			x = offset
+		}
+
+		for _, item := range r.items[i:j] {
+			item.Resize(itemSize)
+			item.Move(fyne.NewPos(x, y))
+			if r.checks.Horizontal {
+				x += itemWidth
+			} else {
+				y += itemHeight
+			}
+		}
+
 		if r.checks.Horizontal {
-			x += itemWidth
+			offset += itemHeight
 		} else {
-			y += itemHeight
+			offset += itemWidth
 		}
 	}
 }
@@ -221,10 +260,14 @@ func (r *checkGroupRenderer) MinSize() fyne.Size {
 		height = fyne.Max(height, itemMin.Height)
 	}
 
+	lenritems := float32(len(r.items))
+	numcolumns := float32(r.checks.numColumns)
 	if r.checks.Horizontal {
-		width = width * float32(len(r.items))
+		width = (width * lenritems) / numcolumns
+		height = height * numcolumns
 	} else {
-		height = height * float32(len(r.items))
+		height = (height * lenritems) / numcolumns
+		width = width * numcolumns
 	}
 
 	return fyne.NewSize(width, height)
@@ -245,7 +288,7 @@ func (r *checkGroupRenderer) updateItems() {
 			r.SetObjects(append(r.Objects(), item))
 			r.items = append(r.items, item)
 		}
-		r.Layout(r.checks.Size())
+		r.Layout(r.checks.Size()) // argument is ignored
 	} else if len(r.items) > len(r.checks.Options) {
 		total := len(r.checks.Options)
 		r.items = r.items[:total]