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

Cleaned up Container somewhat

Browse Source
This commit is contained in:
Sasha Koshka 2023-03-04 01:26:23 -05:00
parent 165d0835bf
commit 252433f13d
1 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
elements/basic/container.go
View File

@ -203,17 +203,6 @@ func (element *Container) ChildAt (point image.Point) (child elements.Element) {
return return
} }
func (element *Container) childPosition (child elements.Element) (position image.Point) {
for _, entry := range element.children {
if entry.Element == child {
position = entry.Bounds.Min
break
}
}
return
}
func (element *Container) redoAll () { func (element *Container) redoAll () {
if !element.core.HasImage() { return } if !element.core.HasImage() { return }
// do a layout // do a layout
@ -236,7 +225,6 @@ func (element *Container) redoAll () {
} }
} }
// SetTheme sets the element's theme. // SetTheme sets the element's theme.
func (element *Container) SetTheme (new theme.Theme) { func (element *Container) SetTheme (new theme.Theme) {
if new == element.theme.Theme { return } if new == element.theme.Theme { return }
@ -279,24 +267,6 @@ func (element *Container) OnFocusMotionRequest (
element.Propagator.OnFocusMotionRequest(callback) element.Propagator.OnFocusMotionRequest(callback)
} }
func (element *Container) forFocused (callback func (child elements.Focusable) bool) {
for _, entry := range element.children {
child, focusable := entry.Element.(elements.Focusable)
if focusable && child.Focused() {
if !callback(child) { break }
}
}
}
func (element *Container) forFocusable (callback func (child elements.Focusable) bool) {
for _, entry := range element.children {
child, focusable := entry.Element.(elements.Focusable)
if focusable {
if !callback(child) { break }
}
}
}
func (element *Container) forFlexible (callback func (child elements.Flexible) bool) { func (element *Container) forFlexible (callback func (child elements.Flexible) bool) {
for _, entry := range element.children { for _, entry := range element.children {
child, flexible := entry.Element.(elements.Flexible) child, flexible := entry.Element.(elements.Flexible)
@ -306,31 +276,16 @@ func (element *Container) forFlexible (callback func (child elements.Flexible) b
} }
} }
func (element *Container) forFocusableBackward (callback func (child elements.Focusable) bool) {
for index := len(element.children) - 1; index >= 0; index -- {
child, focusable := element.children[index].Element.(elements.Focusable)
if focusable {
if !callback(child) { break }
}
}
}
func (element *Container) firstFocused () (index int) {
for currentIndex, entry := range element.children {
child, focusable := entry.Element.(elements.Focusable)
if focusable && child.Focused() {
return currentIndex
}
}
return -1
}
func (element *Container) reflectChildProperties () { func (element *Container) reflectChildProperties () {
element.focusable = false element.focusable = false
element.forFocusable (func (elements.Focusable) bool { for _, entry := range element.children {
_, focusable := entry.Element.(elements.Focusable)
if focusable {
element.focusable = true element.focusable = true
return false break
}) }
}
element.flexible = false element.flexible = false
element.forFlexible (func (elements.Flexible) bool { element.forFlexible (func (elements.Flexible) bool {
element.flexible = true element.flexible = true
@ -348,16 +303,22 @@ func (element *Container) childFocusRequestCallback (
) { ) {
if element.onFocusRequest != nil && element.onFocusRequest() { if element.onFocusRequest != nil && element.onFocusRequest() {
element.focused = true element.focused = true
element.forFocused (func (child elements.Focusable) bool { element.unfocusAllChildren()
child.HandleUnfocus()
return true
})
return true return true
} else { } else {
return false return false
} }
} }
func (element *Container) unfocusAllChildren() {
for _, entry := range element.children {
child, focusable := entry.Element.(elements.Focusable)
if focusable && child.Focused() {
child.HandleUnfocus()
}
}
}
func (element *Container) updateMinimumSize () { func (element *Container) updateMinimumSize () {
margin := element.theme.Margin(theme.PatternBackground) margin := element.theme.Margin(theme.PatternBackground)
padding := element.theme.Padding(theme.PatternBackground) padding := element.theme.Padding(theme.PatternBackground)