Skip to content

Modified the _deviceOrientation property #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kinglonghuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified the _deviceOrientation property #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions FPPopoverController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ @interface FPPopoverController()
UIWindow *_window;
UIView *_parentView;
UIView *_fromView;
UIDeviceOrientation _deviceOrientation;
UIInterfaceOrientation _deviceOrientation;

BOOL _shadowsHidden;
CGColorRef _shadowColor;
Expand Down Expand Up @@ -68,7 +68,7 @@ -(void)addObservers
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(willPresentNewPopover:) name:@"FPNewPopoverPresented" object:nil];

_deviceOrientation = [UIDevice currentDevice].orientation;
_deviceOrientation = [UIApplication sharedApplication].statusBarOrientation;

}

Expand Down Expand Up @@ -212,13 +212,11 @@ -(BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfac

-(CGFloat)parentWidth
{
return _parentView.bounds.size.width;
//return UIDeviceOrientationIsPortrait(_deviceOrientation) ? _parentView.frame.size.width : _parentView.frame.size.height;
return UIDeviceOrientationIsPortrait(_deviceOrientation) ? _parentView.frame.size.width : _parentView.frame.size.height;
}
-(CGFloat)parentHeight
{
return _parentView.bounds.size.height;
//return UIDeviceOrientationIsPortrait(_deviceOrientation) ? _parentView.frame.size.height : _parentView.frame.size.width;
return UIDeviceOrientationIsPortrait(_deviceOrientation) ? _parentView.frame.size.height : _parentView.frame.size.width;
}

-(void)presentPopoverFromPoint:(CGPoint)fromPoint
Expand Down Expand Up @@ -359,7 +357,7 @@ -(void)setOrigin:(CGPoint)origin

-(void)deviceOrientationDidChange:(NSNotification*)notification
{
_deviceOrientation = [UIDevice currentDevice].orientation;
_deviceOrientation = [UIApplication sharedApplication].statusBarOrientation;

BOOL shouldResetView = NO;

Expand Down