Skip to content

Bug fix to popover cropping in Feature/arc #1

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
qixotic wants to merge 1 commit into
base: feature/arc
Choose a base branch
from
Open

Bug fix to popover cropping in Feature/arc #1

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
7 changes: 4 additions & 3 deletions Classes/Popover/WEPopoverContainerView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ - (void)determineGeometryForSize:(CGSize)theContentSize anchorRect:(CGRect)ancho
}
// If still going past right, resize width
if (theOffset.x + theSize.width > CGRectGetMaxX(displayArea)) {
shift = CGRectGetMaxX(displayArea) - (theOffset.x + theSize.width);
shift = theOffset.x + theSize.width - CGRectGetMaxX(displayArea);
theSize.width -= shift;
}
// If going past the bottom bounds, resize height
Expand Down Expand Up @@ -235,9 +235,10 @@ - (void)determineGeometryForSize:(CGSize)theContentSize anchorRect:(CGRect)ancho
xArrowOffset -= shift;
theOffset.x += shift;
}

// If still going past right, resize width
if (theOffset.x + theSize.width > CGRectGetMaxX(displayArea)) {
shift = CGRectGetMaxX(displayArea) - (theOffset.x + theSize.width);
shift = theOffset.x + theSize.width - CGRectGetMaxX(displayArea);
theSize.width -= shift;
}
// If going past the top bounds, resize height and shift offset
Expand Down Expand Up @@ -390,7 +391,7 @@ - (void)determineGeometryForSize:(CGSize)theContentSize anchorRect:(CGRect)ancho
arrowImage = rightArrowImage;
break;
}

NSAssert(!CGRectEqualToRect(bgRect, CGRectNull), @"bgRect is null");

}
Expand Down