tomo/objects
tomo/objects
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 27 Wiki Activity

Combine Row/Column layouts into Contract layout

Browse Source
This commit is contained in:
Sasha Koshka 2024-05-17 03:56:49 -04:00
parent 68d49e1b02
commit 1cb9e8091e
2 changed files with 86 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layouts/flow.go
View File

@ -119,9 +119,5 @@ func (flow Flow) deltaMinor (rectangle image.Rectangle) int {
} }
} }
func (flow Flow) fallback () tomo.Layout { func (flow Flow) fallback () tomo.Layout {
if flow.v() { return Contract(flow)
return Column { }
} else {
return Row { }
}
} }

95
layouts/layouts.go
View File

@ -3,9 +3,29 @@ package layouts
import "image" import "image"
import "git.tebibyte.media/tomo/tomo" import "git.tebibyte.media/tomo/tomo"
type Row struct { } // Contract is a layout that arranges boxes in a simple row or column according
// to their minimum sizes.
type Contract bool
func (Row) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point { // ContractVertical is a vertical contracted layout.
const ContractVertical Contract = true
// ContractHorizontal is a horizontal contracted layout.
const ContractHorizontal Contract = false
func (contract Contract) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
if contract.v() {
dot := image.Point { }
for _, box := range boxes {
minimum := box.MinimumSize()
dot.Y += minimum.Y
if dot.X < minimum.X {
dot.X = minimum.X
}
}
dot.Y += hints.Gap.Y * (len(boxes) - 1)
return dot
} else {
dot := image.Point { } dot := image.Point { }
for _, box := range boxes { for _, box := range boxes {
minimum := box.MinimumSize() minimum := box.MinimumSize()
@ -17,9 +37,34 @@ func (Row) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
dot.X += hints.Gap.X * (len(boxes) - 1) dot.X += hints.Gap.X * (len(boxes) - 1)
return dot return dot
} }
}
func (Row) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) { func (contract Contract) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
// TODO respect alignment value if contract.v() {
dot := hints.Bounds.Min
for index, box := range boxes {
if index > 0 { dot.Y += hints.Gap.Y }
minimum := box.MinimumSize()
box.SetBounds(image.Rectangle {
Min: dot,
Max: dot.Add(image.Pt(hints.Bounds.Dx(), minimum.Y)),
})
dot.Y += minimum.Y
}
height := dot.Y - hints.Bounds.Min.Y
offset := 0
switch hints.AlignY {
case tomo.AlignMiddle:
offset = (hints.Bounds.Dy() - height) / 2
case tomo.AlignEnd:
offset = hints.Bounds.Dy() - height
}
for _, box := range boxes {
box.SetBounds(box.Bounds().Add(image.Pt(0, offset)))
}
} else {
dot := hints.Bounds.Min dot := hints.Bounds.Min
for index, box := range boxes { for index, box := range boxes {
if index > 0 { dot.X += hints.Gap.X } if index > 0 { dot.X += hints.Gap.X }
@ -44,45 +89,7 @@ func (Row) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
box.SetBounds(box.Bounds().Add(image.Pt(offset, 0))) box.SetBounds(box.Bounds().Add(image.Pt(offset, 0)))
} }
} }
type Column struct { }
func (Column) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
dot := image.Point { }
for _, box := range boxes {
minimum := box.MinimumSize()
dot.Y += minimum.Y
if dot.X < minimum.X {
dot.X = minimum.X
}
}
dot.Y += hints.Gap.Y * (len(boxes) - 1)
return dot
} }
func (Column) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) { func (contract Contract) v () bool { return contract == ContractVertical }
// TODO respect alignment value func (contract Contract) h () bool { return contract == ContractHorizontal }
dot := hints.Bounds.Min
for index, box := range boxes {
if index > 0 { dot.Y += hints.Gap.Y }
minimum := box.MinimumSize()
box.SetBounds(image.Rectangle {
Min: dot,
Max: dot.Add(image.Pt(hints.Bounds.Dx(), minimum.Y)),
})
dot.Y += minimum.Y
}
height := dot.Y - hints.Bounds.Min.Y
offset := 0
switch hints.AlignY {
case tomo.AlignMiddle:
offset = (hints.Bounds.Dy() - height) / 2
case tomo.AlignEnd:
offset = hints.Bounds.Dy() - height
}
for _, box := range boxes {
box.SetBounds(box.Bounds().Add(image.Pt(0, offset)))
}
}