Skip to content

Fix OC makeFrame Bug and Swift make(height:, width:) Bug #47

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
Lision wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix OC makeFrame Bug and Swift make(height:, width:) Bug #47

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
a2e6637
fix swift func bug
Lision Dec 28, 2017
2c4baf0
fix makeFrame bug
Lision Jan 4, 2018
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
4 changes: 2 additions & 2 deletions JHChainableAnimations/ChainableAnimator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public extension ChainableAnimator {
return self
}

public func make(height: Float, width: Float) -> Self {
animator.makeSize()(height.toCG, width.toCG)
public func make(width: Float, height: Float) -> Self {
animator.makeSize()(width.toCG, height.toCG)
return self
}

Expand Down
3 changes: 1 addition & 2 deletions JHChainableAnimations/JHChainableAnimator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,7 @@ - (JHChainableAnimationWithCompletion)animateWithCompletion
- (JHChainableRect)makeFrame
{
JHChainableRect chainable = JHChainableRect(rect) {

return self.makeOrigin(rect.origin.x, rect.origin.y).makeBounds(rect);
return self.makeBounds(rect).makeOrigin(rect.origin.x, rect.origin.y);
};

return chainable;
Expand Down