Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[WEEX-644][Android] fix transform origin not right when animating with Animatio… #1634

Merged
merged 1 commit into from
Oct 15, 2018
+7 −0
Merged

[WEEX-644][Android] fix transform origin not right when animating with Animatio… #1634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
import com.taobao.weex.common.Constants;
import com.taobao.weex.ui.animation.BackgroundColorProperty;
import com.taobao.weex.ui.animation.HeightProperty;
import com.taobao.weex.ui.animation.WXAnimationBean;
Expand Down Expand Up @@ -120,6 +121,12 @@ public void executeAction() {

if (null != mAnimationBean.styles) {
if(styleNeedInit) {
// Synchronize transformOrigin between component styles and animation style before
// animation start.
String transformOrigin = (String) component.getStyles().get(Constants.Name.TRANSFORM_ORIGIN);
if (TextUtils.isEmpty(mAnimationBean.styles.transformOrigin)) {
mAnimationBean.styles.transformOrigin = transformOrigin;
}
mAnimationBean.styles.init(mAnimationBean.styles.transformOrigin,
mAnimationBean.styles.transform, (int) component.getLayoutWidth(),
(int) component.getLayoutHeight(),
Expand Down