Merge pull request gotosleep#178 from joejcon1/rightOverpan

gotosleep · gotosleep · commit 5913385464f1 · 2014-03-05T13:22:54.000-08:00
fixed a bug where user could overpan on the left even if allowLeftOverpa...
diff --git a/JASidePanels/Source/JASidePanelController.m b/JASidePanels/Source/JASidePanelController.m
@@ -609,6 +609,8 @@ - (CGFloat)_correctMovement:(CGFloat)movement {
     } else if (self.state == JASidePanelRightVisible && !self.allowRightOverpan) {
         if (position < -self.rightVisibleWidth) {
             return 0.0f;
+        } else if ((self.style == JASidePanelMultipleActive || self.pushesSidePanels) && position > 0.0f) {
+            return -_centerPanelRestingFrame.origin.x;
         } else if (position > self.rightPanelContainer.frame.origin.x) {
             return self.rightPanelContainer.frame.origin.x - _centerPanelRestingFrame.origin.x;
         }

Original file line number	Diff line number	Diff line change
`@@ -609,6 +609,8 @@ - (CGFloat)_correctMovement:(CGFloat)movement {`
`609`	`609`	`} else if (self.state == JASidePanelRightVisible && !self.allowRightOverpan) {`
`610`	`610`	`if (position < -self.rightVisibleWidth) {`
`611`	`611`	`return 0.0f;`
	`612`	`+ } else if ((self.style == JASidePanelMultipleActive \|\| self.pushesSidePanels) && position > 0.0f) {`
	`613`	`+ return -_centerPanelRestingFrame.origin.x;`
`612`	`614`	`} else if (position > self.rightPanelContainer.frame.origin.x) {`
`613`	`615`	`return self.rightPanelContainer.frame.origin.x - _centerPanelRestingFrame.origin.x;`
`614`	`616`	`}`