avm2: Ensure the focus is dropped when it's removed #16231
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
Dinnerbone
approved these changes
May 7, 2024
All the interactive objects had the has_focus flag in their concrete implementations (even AVM2 button, which did not use it at all). This patch moves it to InteractiveObject (as a bit flag), making it easier to manage and use through the has_focus, set_has_focus methods. Additionally, the operation of setting the current focus to None when an object was having it was popular enough that it warranted its own method of drop_focus.
This method prevents code duplication performed when overwriting set_parent to inject some behavior when the parent is removed.
The logic of dropping the focus when it's removed applies not only to TextFields but for every InteractiveObject. This patch ensures that any focus is dropped when its parent is removed.
This test verifies the behavior of Selection.getFocus() when the focus is removed.
This test verifies the behavior of stage.focus when the focus is removed from the stage.
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.
Related to #5443.
The logic of dropping the focus when it's removed applies not only to
TextFields but for everyInteractiveObject. This patch ensures that any focus is dropped when its parent is removed.Additionally, some refactors are included:
has_focustoInteractiveObject, add methodshas_focus,set_has_focus,drop_focus,DisplayObject.on_parent_removedmethod that prevents code duplication.cc @adrian17 regarding the AVM2 button's
has_focusrefactor and the behavior of removing the currently held focus (which we talked about)