Fire button and shield button animations #476
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
tomasstrba
commented
Mar 21, 2022
| @@ -2738,6 +2755,29 @@ | |||
| path = View; | |||
| sourceTree = "<group>"; | |||
| }; | |||
| AA7EB6EE27E880EA00036718 /* Animations */ = { | |||
There was a problem hiding this comment.
I moved animations to their own subfolder. My apology for the harder readability of this PR because of this
tomasstrba
commented
Mar 21, 2022
|
|
||
| @Published var isAnimationViewVisible = false | ||
|
|
||
| override var image: NSImage? { |
There was a problem hiding this comment.
In case something sets the image while animation is in progress
tomasstrba
commented
Mar 21, 2022
| import Lottie | ||
| import Combine | ||
|
|
||
| final class MouseOverAnimationButton: AddressBarButton { |
There was a problem hiding this comment.
This class encapsulates the mouse over animation. Developer only sets animationNames and class loads and runs animation as necessary.
mallexxx
requested changes
Mar 25, 2022
| @@ -417,7 +418,7 @@ extension AddressBarViewController { | |||
|
|
|||
| if let point = self.view.mouseLocationInsideBounds(event.locationInWindow) { | |||
| guard self.view.window?.firstResponder !== addressBarTextField.currentEditor(), | |||
| !(self.view.hitTest(point) is NSButton) | |||
| !(self.view.hitTest(point) is NSButton || self.view.hitTest(point) is AnimationView) | |||
There was a problem hiding this comment.
I suggest moving this as a var of a private NSView extension something like shouldShowArrowCursor in sake of effeciency and readability
There was a problem hiding this comment.
Good suggestion 👍 thanks
mallexxx
approved these changes
Mar 25, 2022
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.
Task/Issue URL: https://app.asana.com/0/0/1201945397495594/f
Description:
Fire button and shield button animates if mouse cursor is over
Steps to test this PR:
Test fire button mouse over animation
Test shield mouse over animation
Internal references:
Software Engineering Expectations
Technical Design Template
When ready for review, remember to post the PR in MM