Skip to content

Call StartAnimation on m_scaleCombined for ScaleX / ScaleY animations #3829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stecrain merged 2 commits into from
Jan 6, 2020
Merged

Call StartAnimation on m_scaleCombined for ScaleX / ScaleY animations #3829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a45430
Call StartAnimatiom on m_scaleCombined for ScaleX / ScaleY animations
Thristhart Jan 3, 2020
4619317
Change files
Thristhart Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions change/react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"comment": "Call StartAnimatiom on m_scaleCombined for ScaleX / ScaleY animations",
"packageName": "react-native-windows",
"email": "[email protected]",
"commit": "0a4543017e3778a5436828340c675bbb13600a6a",
"date": "2020-01-03T22:45:45.183Z",
"file": "D:\\projects\\react-native-windows\\change\\react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json"
}
4 changes: 2 additions & 2 deletions vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ void PropsAnimatedNode::StartAnimations() {
uiElement.StartAnimation(m_translationCombined);
} else if (anim.second.Target() == L"Scale.X") {
m_subchannelPropertySet.StartAnimation(L"ScaleX", anim.second);
uiElement.StartAnimation(m_translationCombined);
uiElement.StartAnimation(m_scaleCombined);
} else if (anim.second.Target() == L"Scale.Y") {
m_subchannelPropertySet.StartAnimation(L"ScaleY", anim.second);
uiElement.StartAnimation(m_translationCombined);
uiElement.StartAnimation(m_scaleCombined);
} else {
uiElement.StartAnimation(anim.second);
}
Expand Down