Bugfix #948: support focus traversal in dialogs #1318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+403
to
+404
| prevFocusMgr.FocusLost() | ||
| focusMgr.FocusGained() |
There was a problem hiding this comment.
Is it possible for prevFocusMgr == focusMgr?
There was a problem hiding this comment.
Good catch! It might be possible with concurrent changes to the overlay stack.
I’ll add missing locking to the stack and also change the callback to be safe by design.
There was a problem hiding this comment.
Instead of locking, what if you just return early if they are equal?
This makes `overlayChanged` robust against concurrent changes to the overlay stack. The locking, that was introduced into the stack earlier, already ensured `focusMgr != prevFocusMgr` but using explicit values from the caller is a more elegant approach which does not rely on caller’s lock.
| @@ -386,6 +384,20 @@ func (c *glCanvas) objectTrees() []fyne.CanvasObject { | |||
| return trees | |||
| } | |||
|
|
|||
| func (c *glCanvas) overlayChanged(focusMgr, prevFocusMgr *app.FocusManager) { | |||
| c.Lock() | |||
| defer c.Unlock() | |||
There was a problem hiding this comment.
nit: It might be better to not use a defer here, and instead move c.Unlock() down to after line 396. In case dev is doing something weird in Focus{Lost|Gained} which could cause deadlock
stuartmscott
approved these changes
Sep 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
This PR introduces
FocusManagers per overlay and the according handling in theglCanvas. Thus it is possible to traverseFocusables in dialogs (and other overlays).Fixes #948
Checklist: