- Fixed a bug where menu animation does not get completed when switching to another view controller because that viewController is not presenting the menu (delegate return NO or not implemented)

aryaxt · aryaxt · commit 835e8bedd1cf · 2014-01-26T15:47:01.000-08:00
diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m
@@ -370,8 +370,8 @@ - (void)moveHorizontallyToLocation:(CGFloat)location
 - (void)updateMenuAnimation:(Menu)menu
 {
 	CGFloat progress = (menu == MenuLeft)
-		? (self.horizontalLocation / self.maxXForDragging)
-		: (self.horizontalLocation / self.minXForDragging);
+		? (self.horizontalLocation / (self.horizontalSize - self.slideOffset))
+		: (self.horizontalLocation / ((self.horizontalSize - self.slideOffset) * -1));
 	
 	[self.menuRevealAnimator animateMenu:menu withProgress:progress];
 }

Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,8 @@ - (void)moveHorizontallyToLocation:(CGFloat)location`
`370`	`370`	`- (void)updateMenuAnimation:(Menu)menu`
`371`	`371`	`{`
`372`	`372`	`CGFloat progress = (menu == MenuLeft)`
`373`		`- ? (self.horizontalLocation / self.maxXForDragging)`
`374`		`- : (self.horizontalLocation / self.minXForDragging);`
	`373`	`+ ? (self.horizontalLocation / (self.horizontalSize - self.slideOffset))`
	`374`	`+ : (self.horizontalLocation / ((self.horizontalSize - self.slideOffset) * -1));`
`375`	`375`
`376`	`376`	`[self.menuRevealAnimator animateMenu:menu withProgress:progress];`
`377`	`377`	`}`