Some internal layouts return recommended sizes

Row/Column uses correct axis for determining free space
2024-06-15 09:27:35 -04:00 · 2024-06-15 07:58:51 -04:00
3 changed files with 10 additions and 10 deletions
--- a/layouts/rowcol.go
+++ b/layouts/rowcol.go
@ -54,7 +54,7 @@ func (column Column) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
 			if expands(index) {
 				nExpanding ++
 			} else {
-				freeSpace -= float64(box.MinimumSize().X)
+				freeSpace -= float64(box.MinimumSize().Y)
 			}
 		}
 		expandingSize = freeSpace / float64(nExpanding)
@ -125,7 +125,7 @@ func (row Row) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
 			if expands(index) {
 				nExpanding ++
 			} else {
-				freeSpace -= float64(box.MinimumSize().Y)
+				freeSpace -= float64(box.MinimumSize().X)
 			}
 		}
 		expandingSize = freeSpace / float64(nExpanding)
--- a/scrollbar.go
+++ b/scrollbar.go
@ -335,12 +335,12 @@ func (this scrollbarLayout) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
 	
 }

-func (this scrollbarLayout) RecommendedHeight (tomo.LayoutHints, []tomo.Box, int) int {
-	return 0
+func (this scrollbarLayout) RecommendedHeight (hints tomo.LayoutHints, boxes []tomo.Box, width int) int {
+	return this.MinimumSize(hints, boxes).X
 }

-func (this scrollbarLayout) RecommendedWidth (tomo.LayoutHints, []tomo.Box, int) int {
-	return 0
+func (this scrollbarLayout) RecommendedWidth (hints tomo.LayoutHints, boxes []tomo.Box, height int) int {
+	return this.MinimumSize(hints, boxes).Y
 }

 func (this scrollbarLayout) viewportContentRatio () float64 {
--- a/scrollcontainer.go
+++ b/scrollcontainer.go
@ -184,12 +184,12 @@ func (this *scrollContainerLayout) Arrange (hints tomo.LayoutHints, boxes []tomo
 	}
 }

-func (this *scrollContainerLayout) RecommendedHeight (tomo.LayoutHints, []tomo.Box, int) int {
-	return 0
+func (this *scrollContainerLayout) RecommendedHeight (hints tomo.LayoutHints, boxes []tomo.Box, width int) int {
+	return this.MinimumSize(hints, boxes).X
 }

-func (this *scrollContainerLayout) RecommendedWidth (tomo.LayoutHints, []tomo.Box, int) int {
-	return 0
+func (this *scrollContainerLayout) RecommendedWidth (hints tomo.LayoutHints, boxes []tomo.Box, height int) int {
+	return this.MinimumSize(hints, boxes).Y
 }

 func max (x, y int) int {
Author	SHA1	Message	Date
sashakoshka@tebibyte.media	23fb28ce5c	Some internal layouts return recommended sizes	2024-06-15 09:27:35 -04:00
sashakoshka@tebibyte.media	3533ce3726	Row/Column uses correct axis for determining free space	2024-06-15 07:58:51 -04:00