tomo/tomo-old
tomo/tomo-old
Archived
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Horizontal layout does not use integer math anymore

Browse Source 
Instead it uses fixed.Int26_6. Could have used floats but then we
would need a new point datatype and we already have utility
functions for fixed point math
This commit is contained in:
Sasha Koshka 2023-03-16 20:55:11 -04:00
parent cdf805dadc
commit 4b788dd783
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layouts/basic/horizontal.go
View File

@ -1,8 +1,10 @@
package basicLayouts package basicLayouts
import "image" import "image"
import "golang.org/x/image/math/fixed"
import "git.tebibyte.media/sashakoshka/tomo/artist" import "git.tebibyte.media/sashakoshka/tomo/artist"
import "git.tebibyte.media/sashakoshka/tomo/layouts" import "git.tebibyte.media/sashakoshka/tomo/layouts"
import "git.tebibyte.media/sashakoshka/tomo/fixedutil"
// Horizontal arranges elements horizontally. Elements at the start of the entry // Horizontal arranges elements horizontally. Elements at the start of the entry
// list will be positioned on the left, and elements at the end of the entry // list will be positioned on the left, and elements at the end of the entry
@ -30,19 +32,21 @@ func (layout Horizontal) Arrange (
entries, margin, padding, bounds.Dx()) entries, margin, padding, bounds.Dx())
// set the size and position of each element // set the size and position of each element
dot := bounds.Min dot := fixedutil.Pt(bounds.Min)
for index, entry := range entries { for index, entry := range entries {
if index > 0 && layout.Gap { dot.X += margin.X } if index > 0 && layout.Gap { dot.X += fixed.I(margin.X) }
entry.Bounds.Min = dot entry.Bounds.Min = fixedutil.FloorPt(dot)
entryWidth := 0 entryWidth := fixed.Int26_6(0)
if entry.Expand { if entry.Expand {
entryWidth = expandingElementWidth entryWidth = expandingElementWidth
} else { } else {
entryWidth, _ = entry.MinimumSize() min, _ := entry.MinimumSize()
entryWidth = fixed.I(min)
} }
dot.X += entryWidth dot.X += entryWidth
entry.Bounds.Max = entry.Bounds.Min.Add(image.Pt(entryWidth, bounds.Dy())) entry.Bounds.Max = entry.Bounds.Min.Add (
image.Pt(entryWidth.Floor(), bounds.Dy()))
entries[index] = entry entries[index] = entry
} }
@ -81,7 +85,7 @@ func (layout Horizontal) expandingElementWidth (
padding artist.Inset, padding artist.Inset,
freeSpace int, freeSpace int,
) ( ) (
width int, width fixed.Int26_6,
) { ) {
expandingElements := 0 expandingElements := 0
@ -100,7 +104,7 @@ func (layout Horizontal) expandingElementWidth (
} }
if expandingElements > 0 { if expandingElements > 0 {
width = freeSpace / expandingElements width = fixed.I(freeSpace) / fixed.Int26_6(expandingElements)
} }
return return
} }