Merge pull request #16 from dexcell/master

Fixed scale bug
KieranLafferty · Mar 15, 2013 · fe2e9ed · fe2e9ed
2 parents a71eb2f + ee38377
commit fe2e9ed
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/Classes/KLNoteViewController.m b/Classes/KLNoteViewController.m
@@ -121,7 +121,7 @@ - (CGFloat) defaultVerticalOriginForControllerCard: (KLControllerCard*) controll
     CGFloat originOffset = 0;
     for (int i = 0; i < index; i ++) {
         CGFloat scalingFactor = [self scalingFactorForIndex: i];
-        NSLog(@"%@", controllerCard.navigationController.navigationBar);
+//        NSLog(@"%@", controllerCard.navigationController.navigationBar);
         originOffset += scalingFactor * controllerCard.navigationController.navigationBar.frame.size.height * self.cardNavigationBarOverlap;
     }
 
@@ -328,7 +328,7 @@ -(id) initWithNoteViewController: (KLNoteViewController*) noteView navigationCon
         index = _index;
         originY = [noteView defaultVerticalOriginForControllerCard:self
                                                            atIndex: index];
-        [self setFrame: self.navigationController.view.bounds];
+        [self setFrame: noteView.view.bounds];
 
         //Initialize the view's properties
         [self setAutoresizesSubviews:YES];
@@ -488,9 +488,20 @@ - (void) setState:(KLControllerCardState)state animated:(BOOL) animated{
     if (animated) {
         [UIView animateWithDuration:self.noteViewController.cardAnimationDuration animations:^{
             [self setState:state animated:NO];
+        } completion:^(BOOL finished) {
+            if (state == KLControllerCardStateFullScreen) {
+                // Fix scaling bug when expand to full size
+                self.frame = self.noteViewController.view.bounds;
+                self.navigationController.view.frame = self.frame;
+                self.navigationController.view.layer.cornerRadius = 0;
+            }
         }];
         return;
     }
+
+    // Set corner radius
+    [self.navigationController.view.layer setCornerRadius: self.noteViewController.cardCornerRadius];    
+
     //Full Screen State
     if (state == KLControllerCardStateFullScreen) {
         [self expandCardToFullSize: animated];