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

Fixed a focus issue with ScrollContainer

Browse Source
This commit is contained in:
Sasha Koshka
2023-02-11 00:58:54 -05:00
parent 981c11bd44
commit 0e3de11203
2 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
elements/basic/scrollcontainer.go
View File

@@ -234,7 +234,9 @@ func (element *ScrollContainer) Focused () (focused bool) {
func (element *ScrollContainer) Focus () {
if element.onFocusRequest != nil {
element.onFocusRequest()
if element.onFocusRequest() {
element.focused = true
}
}
}
@@ -244,8 +246,8 @@ func (element *ScrollContainer) HandleFocus (
accepted bool,
) {
if child, ok := element.child.(elements.Focusable); ok {
element.focused = true
return child.HandleFocus(direction)
element.focused = child.HandleFocus(direction)
return element.focused
} else {
element.focused = false
return false
@@ -274,11 +276,9 @@ func (element *ScrollContainer) childDamageCallback (region canvas.Canvas) {
}
func (element *ScrollContainer) childFocusRequestCallback () (granted bool) {
child, ok := element.child.(elements.Focusable)
if !ok { return false }
if element.onFocusRequest != nil && element.onFocusRequest() {
child.HandleFocus(input.KeynavDirectionNeutral)
return true
if element.onFocusRequest != nil {
element.focused = element.onFocusRequest()
return element.focused
} else {
return false
}