Skip to content

Fix scaling when targetWidth or targetHeight is not specified #8

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

Open
sirekanyan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix scaling when targetWidth or targetHeight is not specified #8

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
14 changes: 9 additions & 5 deletions library/src/main/java/com/zoonref/viewbehavior/SimpleViewBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,19 @@ void updateViewWithPercent(View child, float percent) {
float newX = targetX == UNSPECIFIED_INT ? 0 : (targetX - mStartX) * percent;
float newY = targetY == UNSPECIFIED_INT ? 0 : (targetY - mStartY) * percent;

// set scale
if (targetWidth != UNSPECIFIED_INT || targetHeight != UNSPECIFIED_INT) {
// set width scale
if (targetWidth != UNSPECIFIED_INT) {
float newWidth = mStartWidth + ((targetWidth - mStartWidth) * percent);
float newHeight = mStartHeight + ((targetHeight - mStartHeight) * percent);

child.setScaleX(newWidth / mStartWidth);
child.setScaleY(newHeight / mStartHeight);
// make up position for scale change
newX -= (mStartWidth - newWidth) / 2;
}

// set height scale
if (targetHeight != UNSPECIFIED_INT) {
float newHeight = mStartHeight + ((targetHeight - mStartHeight) * percent);
child.setScaleY(newHeight / mStartHeight);
// make up position for scale change
newY -= (mStartHeight - newHeight) / 2;
}

Expand Down