TouchInstinct
/
iOS-Slide-Menu
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '7fb3ec03e919a6d4a5c622f224c2277ace85c61f' into feature/swipeMenuBeginEvent

This commit is contained in:
Павел Круглов 2015-06-30 18:10:29 +03:00
parent a9ca4b49b0 7fb3ec03e9
commit c6c729bb52
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m
View File

@ -122,7 +122,7 @@
{
if (UIDeviceOrientationIsLandscape(orientation))
{
rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;
rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location*-1 : location;
}
else
{

6
SlideMenu/Source/SlideNavigationController.m
View File

@ -537,7 +537,7 @@ static SlideNavigationController *singletonInstance;
if (UIDeviceOrientationIsLandscape(orientation))
{
rect.origin.x = 0;
rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;
rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location*-1 : location;
}
else
{
@ -621,8 +621,8 @@ static SlideNavigationController *singletonInstance;
if (UIDeviceOrientationIsLandscape(orientation))
{
return (orientation == UIDeviceOrientationLandscapeRight)
? rect.origin.y
: rect.origin.y*-1;
? rect.origin.y*-1
: rect.origin.y;
}
else
{