From 687b40b35a0e372a1b83dd5883226e1d77c3987f Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Sun, 2 Jun 2024 22:48:32 -0400 Subject: [PATCH] Fix strange logic in Hierarchy event managing --- internal/system/event.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/system/event.go b/internal/system/event.go index fe76c30..476e6da 100644 --- a/internal/system/event.go +++ b/internal/system/event.go @@ -26,8 +26,8 @@ func (this *Hierarchy) HandleKeyDown (key input.Key, numberPad bool) { } else { this.focusNext() } - } else if this.focused != nil { - this.keyboardTarget().handleKeyDown(key, numberPad) + } else if target := this.keyboardTarget(); target != nil { + target.handleKeyDown(key, numberPad) } } @@ -35,8 +35,8 @@ func (this *Hierarchy) HandleKeyDown (key input.Key, numberPad bool) { // which triggers this comes with modifier key information, HandleModifiers must // be called *before* HandleKeyUp. func (this *Hierarchy) HandleKeyUp (key input.Key, numberPad bool) { - if this.focused == nil { - this.keyboardTarget().handleKeyUp(key, numberPad) + if target := this.keyboardTarget(); target != nil { + target.handleKeyDown(key, numberPad) } }