Skip to content

Fix deprecated imageEdgeInsets for iOS 15 #614

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 deprecated imageEdgeInsets for iOS 15 #614

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
15 changes: 14 additions & 1 deletion Objective-C/TOCropViewController/Views/TOCropToolbar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,20 @@ - (void)layoutToolbarButtons:(NSArray *)buttons withSameButtonSize:(CGSize)size
CGPoint origin = horizontally ? CGPointMake(diffOffset, sameOffset) : CGPointMake(sameOffset, diffOffset);
if (horizontally) {
origin.x += CGRectGetMinX(containerRect);
if (@available(iOS 13.0, *)) {
if (@available(iOS 15.0, *)) {
// iOS 15+: Use UIButtonConfiguration
UIButtonConfiguration *config = button.configuration ?: [UIButtonConfiguration plainButtonConfiguration];

// Position image and text
config.imagePlacement = NSDirectionalRectEdgeLeading;
config.imagePadding = 8;

UIImage *image = button.imageView.image;
config.contentInsets = NSDirectionalEdgeInsetsMake(0, 0, image.baselineOffsetFromBottom, 0);

button.configuration = config;

} else if (@available(iOS 13.0, *)) {
UIImage *image = button.imageView.image;
button.imageEdgeInsets = UIEdgeInsetsMake(0, 0, image.baselineOffsetFromBottom, 0);
}
Expand Down