Skip to content
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

Jump to bottom

TIMOB-11298-propagate layout properties in animation back to proxy after... #3845

Merged
merged 1 commit into from
Feb 12, 2013
Merged

TIMOB-11298-propagate layout properties in animation back to proxy after... #3845

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,15 @@ public void onAnimationEnd(Animation a)
view.setLayoutParams(params);
view.clearAnimation();
relayoutChild = false;
// TIMOB-11298 Propagate layout property changes to proxy
for (Object key : options.keySet()) {
if (TiC.PROPERTY_TOP.equals(key) || TiC.PROPERTY_BOTTOM.equals(key) || TiC.PROPERTY_LEFT.equals(key)
|| TiC.PROPERTY_RIGHT.equals(key) || TiC.PROPERTY_CENTER.equals(key)
|| TiC.PROPERTY_WIDTH.equals(key) || TiC.PROPERTY_HEIGHT.equals(key)
|| TiC.PROPERTY_BACKGROUND_COLOR.equals(key)) {
viewProxy.setProperty((String) key, options.get(key));
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why we are only propagating the layout properties? Can't we just call applyProperties() on the view proxy?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had looked at it but the applyProperties takes everything from the options and call setProperty. Some of these properties are very specific to animation and doesn't make sense to the View.

}

if (applyOpacity && (autoreverse == null || !autoreverse.booleanValue())) {
Expand Down Expand Up @@ -671,7 +680,7 @@ public boolean queueIdle()
}
}
}

public void onAnimationRepeat(Animation a)
{
}
Expand Down