Skip to content

Sets foldView hidden if contentView is visible and set pan direction in unfold left/right view #69

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
alvarhansen wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −0
Open

Sets foldView hidden if contentView is visible and set pan direction in unfold left/right view #69

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
f9202e2
sets foldView hidden if contentView is visible
alvarhansen Mar 29, 2014
3c9e409
fixes issue where user could set pan direction to vertical by vertica…
alvarhansen Mar 29, 2014
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
2 changes: 2 additions & 0 deletions PaperFold/PaperFold/PaperFold/MultiFoldView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,15 @@ - (void)setFrame:(CGRect)frame
float foldWidth = frame.size.width/self.numberOfFolds;
FoldView *foldView = [[FoldView alloc] initWithFrame:CGRectMake(foldWidth*i,0,foldWidth,frame.size.height) foldDirection:_foldDirection];
[foldView setTag:FOLDVIEW_TAG+i];
[foldView setHidden:!self.contentViewHolder.hidden];
[self addSubview:foldView];
}
else if (_foldDirection==FoldDirectionVertical)
{
float foldHeight = frame.size.height/self.numberOfFolds;
FoldView *foldView = [[FoldView alloc] initWithFrame:CGRectMake(0,foldHeight*(self.numberOfFolds-i)-foldHeight,frame.size.width,foldHeight) foldDirection:_foldDirection];
[foldView setTag:FOLDVIEW_TAG+i];
[foldView setHidden:!self.contentViewHolder.hidden];
[self addSubview:foldView];
}
}
Expand Down
4 changes: 4 additions & 0 deletions PaperFold/PaperFold/PaperFold/PaperFoldView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,8 @@ - (void)unfoldLeftView:(NSTimer*)timer
[self.leftFoldView setHidden:NO];
[self.rightFoldView setHidden:NO];

self.paperFoldInitialPanDirection=PaperFoldInitialPanDirectionHorizontal;

CGAffineTransform transform = [self.contentView transform];
float x = transform.tx + (self.leftFoldView.frame.size.width-transform.tx)/4;
transform = CGAffineTransformMakeTranslation(x, 0);
Expand Down Expand Up @@ -661,6 +663,8 @@ - (void)unfoldRightView:(NSTimer*)timer
[self.leftFoldView setHidden:NO];
[self.rightFoldView setHidden:NO];

self.paperFoldInitialPanDirection=PaperFoldInitialPanDirectionHorizontal;

CGAffineTransform transform = [self.contentView transform];
float x = transform.tx - (transform.tx+self.rightFoldView.frame.size.width)/8;
transform = CGAffineTransformMakeTranslation(x, 0);
Expand Down