joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-04 17:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: [API] deliver key events to the first matching filter

Browse Source 
Replace the key.Filter.Target field with a Focus field that matches only
of the specified tag has focus. This has the advantage of simpler event
delivery and for lower latency in delivering key events to new handlers.

For example, consider a UI where a button is activated by a key press,
which is turn displays a dialog with another button activated by the
same key. This change allows two button press(+releases) in the same frame
to arrive at the intended targets: one key press(+release) for each
button.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2023-11-26 17:54:51 -06:00
parent d9a007586c
commit ed0d5d5767
9 changed files with 169 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/input/key.go
+16 -27
View File
@@ -49,10 +49,7 @@ type keyHandler struct {
trans f32.Affine2D
}
type keyFilter struct {
focusable bool
filters []key.Filter
}
type keyFilter []key.Filter
type dirFocusEntry struct {
tag event.Tag
@@ -112,7 +109,7 @@ func (k *keyHandler) ResetEvent() (event.Event, bool) {
func (q *keyQueue) Frame(handlers map[event.Tag]*handler, state keyState) keyState {
if state.focus != nil {
if h, ok := handlers[state.focus]; !ok || !h.filter.key.focusable || !h.key.visible {
if h, ok := handlers[state.focus]; !ok || !h.filter.focusable || !h.key.visible {
// Remove focus from the handler that is no longer focusable.
state.focus = nil
state.state = TextInputClose
@@ -253,21 +250,19 @@ func (q *keyQueue) AreaFor(k *keyHandler) int {
return q.dirOrder[order].area
}
func (k *keyFilter) Matches(e event.Event) bool {
switch e := e.(type) {
case key.Event:
for _, f := range k.filters {
if keyFilterMatch(f, e) {
return true
}
func (k *keyFilter) Matches(focus event.Tag, e key.Event) bool {
for _, f := range *k {
if keyFilterMatch(focus, f, e) {
return true
}
case key.FocusEvent, key.SnippetEvent, key.EditEvent, key.SelectionEvent:
return k.focusable
}
return false
}
func keyFilterMatch(f key.Filter, e key.Event) bool {
func keyFilterMatch(focus event.Tag, f key.Filter, e key.Event) bool {
if f.Focus != nil && f.Focus != focus {
return false
}
if f.Name != e.Name {
return false
}
@@ -308,23 +303,17 @@ func (s keyState) softKeyboard(show bool) keyState {
return s
}
func (k *keyFilter) Add(f event.Filter) {
switch f := f.(type) {
case key.FocusFilter:
k.focusable = true
case key.Filter:
for _, f2 := range k.filters {
if f == f2 {
return
}
func (k *keyFilter) Add(f key.Filter) {
for _, f2 := range *k {
if f == f2 {
return
}
k.filters = append(k.filters, f)
}
*k = append(*k, f)
}
func (k *keyFilter) Merge(k2 keyFilter) {
k.focusable = k.focusable || k2.focusable
k.filters = append(k.filters, k2.filters...)
*k = append(*k, k2...)
}
func (q *keyQueue) inputOp(tag event.Tag, state *keyHandler, t f32.Affine2D, area int, bounds image.Rectangle) {