atomize-element-interface #3

Merged
sashakoshka merged 10 commits from atomize-element-interface into main 2023-01-17 19:33:23 +00:00
3 changed files with 33 additions and 7 deletions
Showing only changes of commit 9459bcd942 - Show all commits

View File

@ -300,7 +300,7 @@ func (element *Container) HandleSelection (direction tomo.SelectionDirection) (o
return false return false
} }
// TODO: fix this! // FIXME: fix this!
// func (element *Container) MinimumHeightFor (width int) (height int) { // func (element *Container) MinimumHeightFor (width int) (height int) {
// return element.layout.MinimumHeightFor(element.children, width) // return element.layout.MinimumHeightFor(element.children, width)
// } // }

View File

@ -3,7 +3,6 @@ package main
import "git.tebibyte.media/sashakoshka/tomo" import "git.tebibyte.media/sashakoshka/tomo"
import "git.tebibyte.media/sashakoshka/tomo/layouts" import "git.tebibyte.media/sashakoshka/tomo/layouts"
import "git.tebibyte.media/sashakoshka/tomo/elements/basic" import "git.tebibyte.media/sashakoshka/tomo/elements/basic"
import "git.tebibyte.media/sashakoshka/tomo/elements/testing"
import _ "git.tebibyte.media/sashakoshka/tomo/backends/x" import _ "git.tebibyte.media/sashakoshka/tomo/backends/x"
func main () { func main () {
@ -11,15 +10,15 @@ func main () {
} }
func run () { func run () {
window, _ := tomo.NewWindow(2, 2) window, _ := tomo.NewWindow(256, 2)
window.SetTitle("horizontal stack") window.SetTitle("horizontal stack")
container := basic.NewContainer(layouts.Horizontal { true, true }) container := basic.NewContainer(layouts.Horizontal { true, true })
window.Adopt(container) window.Adopt(container)
container.Adopt(testing.NewMouse(), true) container.Adopt(basic.NewLabel("this is sample text", true), true)
container.Adopt(basic.NewLabel("<- left\nright ->", false), false) container.Adopt(basic.NewLabel("this is sample text", true), true)
container.Adopt(testing.NewMouse(), true) container.Adopt(basic.NewLabel("this is sample text", true), true)
window.OnClose(tomo.Stop) window.OnClose(tomo.Stop)
window.Show() window.Show()

View File

@ -72,7 +72,6 @@ func (layout Horizontal) Arrange (entries []tomo.LayoutEntry, width, height int)
// arrange the given list of entries. // arrange the given list of entries.
func (layout Horizontal) MinimumSize ( func (layout Horizontal) MinimumSize (
entries []tomo.LayoutEntry, entries []tomo.LayoutEntry,
squeeze int,
) ( ) (
width, height int, width, height int,
) { ) {
@ -93,3 +92,31 @@ func (layout Horizontal) MinimumSize (
} }
return return
} }
func (layout Horizontal) MinimumHeightFor (
entries []tomo.LayoutEntry,
width int,
) (
height int,
) {
if layout.Pad {
width -= theme.Padding() * 2
}
for _, entry := range entries {
var entryHeight int
if child, flexible := entry.Element.(tomo.Flexible); flexible {
entryHeight = child.MinimumHeightFor(width)
} else {
_, entryHeight = entry.MinimumSize()
}
if entryHeight > height {
height = entryHeight
}
}
if layout.Pad {
height += theme.Padding() * 2
}
return
}