From f9202e2c21fe1e48e7b7dd3d92bac9f32394a0b2 Mon Sep 17 00:00:00 2001 From: Alvar Hansen Date: Sat, 29 Mar 2014 16:55:01 +0200 Subject: [PATCH 1/2] sets foldView hidden if contentView is visible --- PaperFold/PaperFold/PaperFold/MultiFoldView.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PaperFold/PaperFold/PaperFold/MultiFoldView.m b/PaperFold/PaperFold/PaperFold/MultiFoldView.m index ca45bf2..eaf8b24 100644 --- a/PaperFold/PaperFold/PaperFold/MultiFoldView.m +++ b/PaperFold/PaperFold/PaperFold/MultiFoldView.m @@ -99,6 +99,7 @@ - (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) @@ -106,6 +107,7 @@ - (void)setFrame:(CGRect)frame 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]; } } From 3c9e4098670d06dac0d7d8c5ad784a7868744711 Mon Sep 17 00:00:00 2001 From: Alvar Hansen Date: Sat, 29 Mar 2014 18:26:14 +0200 Subject: [PATCH 2/2] fixes issue where user could set pan direction to vertical by vertical gesture and if top & bottom folding is not enabled, horizontal panning wouldn't work after --- PaperFold/PaperFold/PaperFold/PaperFoldView.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PaperFold/PaperFold/PaperFold/PaperFoldView.m b/PaperFold/PaperFold/PaperFold/PaperFoldView.m index 9a303e0..f53206c 100644 --- a/PaperFold/PaperFold/PaperFold/PaperFoldView.m +++ b/PaperFold/PaperFold/PaperFold/PaperFoldView.m @@ -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); @@ -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);