Merge pull request #4 from lxcid/master

Tracks the paper fold state and updates accordingly + A bug fix to a bug I introduced.
honcheng · Nov 20, 2012 · a448d9e · a448d9e
2 parents 0e25242 + bfc096f
commit a448d9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/PaperFoldMenuController/PaperFold b/PaperFoldMenuController/PaperFold
diff --git a/PaperFoldMenuController/PaperFoldMenuController.m b/PaperFoldMenuController/PaperFoldMenuController.m
@@ -172,8 +172,8 @@ - (id)initWithMenuWidth:(float)menuWidth numberOfFolds:(int)numberOfFolds
     return self;
 }
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+- (id)initWithNibName:(NSString *)theNibNameOrNil bundle:(NSBundle *)theNibBundleOrNil {
-    self = [super initWithNibName:nil bundle:nil];
+    self = [super initWithNibName:theNibNameOrNil bundle:theNibBundleOrNil];
     if (self)
     {
         [self commonInit];
@@ -210,6 +210,7 @@ - (void)viewDidLoad
     [self.paperFoldView setLeftFoldContentView:menuTableView foldCount:self.numberOfFolds pullFactor:0.9];
     [menuTableView setDelegate:self];
     [menuTableView setDataSource:self];
+    menuTableView.scrollsToTop = !(self.paperFoldView.state == PaperFoldStateDefault);
     self.menuTableView = menuTableView;
 
     ShadowView *menuTableViewSideShadowView = [[ShadowView alloc] initWithFrame:CGRectMake(_menuTableView.frame.size.width-3,0,3,[self.view bounds].size.height) foldDirection:FoldDirectionHorizontalLeftToRight];
@@ -322,4 +323,11 @@ - (void)showMenu:(BOOL)show animated:(BOOL)animated
     }
 }
 
+#pragma mark - PaperFoldViewDelegate methods
+
+- (void)paperFoldView:(id)thePaperFoldView didFoldAutomatically:(BOOL)theAutomated toState:(PaperFoldState)thePaperFoldState {
+    BOOL thePaperFoldViewDidFold = (thePaperFoldState == PaperFoldStateDefault);
+    self.menuTableView.scrollsToTop = !thePaperFoldViewDidFold;
+}
+
 @end