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

Text labels are now drawn

Browse Source 
The typesetter will need to be reworked to properly break lines in
the middle of words for this to function properly.
This commit is contained in:
Sasha Koshka 2023-03-23 15:38:51 -04:00
parent 7ec5e1ab2a
commit 6c8ff55dc1
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
elements/file/directory.go
View File

@ -8,6 +8,7 @@ import "git.tebibyte.media/sashakoshka/tomo/input"
import "git.tebibyte.media/sashakoshka/tomo/artist" import "git.tebibyte.media/sashakoshka/tomo/artist"
import "git.tebibyte.media/sashakoshka/tomo/canvas" import "git.tebibyte.media/sashakoshka/tomo/canvas"
import "git.tebibyte.media/sashakoshka/tomo/config" import "git.tebibyte.media/sashakoshka/tomo/config"
import "git.tebibyte.media/sashakoshka/tomo/textdraw"
import "git.tebibyte.media/sashakoshka/tomo/elements" import "git.tebibyte.media/sashakoshka/tomo/elements"
import "git.tebibyte.media/sashakoshka/tomo/elements/core" import "git.tebibyte.media/sashakoshka/tomo/elements/core"
@ -15,6 +16,8 @@ type fileLayoutEntry struct {
*File *File
fs.DirEntry fs.DirEntry
Bounds image.Rectangle Bounds image.Rectangle
Drawer textdraw.Drawer
TextPoint image.Point
} }
type historyEntry struct { type historyEntry struct {
@ -135,6 +138,11 @@ func (element *DirectoryView) Update () error {
}) })
element.children[index].File = file element.children[index].File = file
element.children[index].DirEntry = entry element.children[index].DirEntry = entry
element.children[index].Drawer.SetFace (element.theme.FontFace(
theme.FontStyleRegular,
theme.FontSizeNormal))
element.children[index].Drawer.SetText([]rune(entry.Name()))
element.children[index].Drawer.SetAlign(textdraw.AlignCenter)
} }
if element.core.HasImage() { if element.core.HasImage() {
@ -204,6 +212,12 @@ func (element *DirectoryView) redoAll () {
if element.onScrollBoundsChange != nil { if element.onScrollBoundsChange != nil {
element.onScrollBoundsChange() element.onScrollBoundsChange()
} }
// draw labels
foreground := element.theme.Color(theme.ColorForeground, theme.State { })
for _, entry := range element.children {
entry.Drawer.Draw(element.core, foreground, entry.TextPoint)
}
} }
func (element *DirectoryView) partition () { func (element *DirectoryView) partition () {
@ -302,12 +316,13 @@ func (element *DirectoryView) doLayout () {
beginningOfRow := true beginningOfRow := true
dot := bounds.Min.Sub(element.scroll) dot := bounds.Min.Sub(element.scroll)
rowHeight := 0
for index, entry := range element.children { for index, entry := range element.children {
width, height := entry.MinimumSize() width, height := entry.MinimumSize()
if dot.X + width > bounds.Max.X { if dot.X + width > bounds.Max.X {
dot.X = bounds.Min.Sub(element.scroll).X dot.X = bounds.Min.Sub(element.scroll).X
dot.Y += height dot.Y += rowHeight
if index > 1 { if index > 1 {
dot.Y += margin.Y dot.Y += margin.Y
} }
@ -320,10 +335,22 @@ func (element *DirectoryView) doLayout () {
dot.X += margin.X dot.X += margin.X
} }
entry.Bounds.Min = dot entry.Drawer.SetMaxWidth(width)
entry.Bounds.Max = image.Pt(dot.X + width, dot.Y + height) bounds := image.Rect(dot.X, dot.Y, dot.X + width, dot.Y + height)
entry.Bounds = bounds
drawerHeight := entry.Drawer.ReccomendedHeightFor(width)
entry.TextPoint =
image.Pt(bounds.Min.X, bounds.Max.Y + margin.Y).
Sub(entry.Drawer.LayoutBounds().Min)
bounds.Max.Y += margin.Y + drawerHeight
height += margin.Y + drawerHeight
if rowHeight < height {
rowHeight = height
}
element.contentBounds = element.contentBounds.Union(bounds)
element.children[index] = entry element.children[index] = entry
element.contentBounds = element.contentBounds.Union(entry.Bounds)
dot.X += width dot.X += width
} }