Skip to content

Fix toolbar cover on iPadOS26 top-left windowingControl area. #631

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

Fix toolbar cover on iPadOS26 top-left windowingControl area. #631

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
17 changes: 14 additions & 3 deletions Objective-C/TOCropViewController/TOCropViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,17 @@ - (UIRectEdge)preferredScreenEdgesDeferringSystemGestures
- (CGRect)frameForToolbarWithVerticalLayout:(BOOL)verticalLayout
{
UIEdgeInsets insets = self.statusBarSafeInsets;

// fix: On iOS 26, overlay with iPadOS windowingControl area.
if (@available(iOS 26.0, *)) {
if (!verticalLayout) {
UIViewLayoutRegion *layoutRegion = [UIViewLayoutRegion safeAreaLayoutRegionWithCornerAdaptation: UIViewLayoutRegionAdaptivityAxisVertical];
UIEdgeInsets edgeInsets = [self.view edgeInsetsForLayoutRegion:layoutRegion];
insets.top = edgeInsets.top;
insets.left = edgeInsets.left;
insets.bottom = edgeInsets.bottom;
}
}

CGRect frame = CGRectZero;
if (!verticalLayout) { // In landscape laying out toolbar to the left
Expand All @@ -291,10 +302,10 @@ - (CGRect)frameForToolbarWithVerticalLayout:(BOOL)verticalLayout
#else
CGFloat minPadding = 16.0f;
#endif
frame.origin.x = insets.left + minPadding;
frame.origin.y = minPadding;
frame.origin.x = insets.left;
frame.origin.y = minPadding + insets.top;
frame.size.width = kTOCropViewControllerToolbarHeight;
frame.size.height = CGRectGetHeight(self.view.frame) - (minPadding * 2.0f);
frame.size.height = CGRectGetHeight(self.view.frame) - (minPadding * 2.0f) - insets.top - insets.bottom;
} else {
frame.origin.x = insets.left;
frame.origin.y = 0.0f;
Expand Down