Merge pull request #178 from joejcon1/rightOverpan

fixed a bug where user could overpan on the left even if allowLeftOverpa...
gotosleep · Mar 5, 2014 · 5913385 · 5913385
2 parents e1d93d1 + 683461c
commit 5913385
Showing 1 changed file with 2 additions and 0 deletions.
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;
         }