Skip to content

Fix corner configuration for iOS 26 and iOS 18 #55

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

Merged
TimOliver merged 1 commit into from
Nov 24, 2025
Merged

Fix corner configuration for iOS 26 and iOS 18 #55

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
49 changes: 33 additions & 16 deletions TORoundedButton/TORoundedButton.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,17 @@ @implementation TORoundedButton {

/** A background view that displays the rounded box behind the button text. */
UIView *_backgroundView;

#ifdef __IPHONE_26_0
/** Maintain a reference to the corner configuration in case we swap out the background view */
UICornerConfiguration *_cornerConfiguration API_AVAILABLE(ios(26.0));
#endif
}

#pragma mark - View Creation -

- (instancetype)init {
if (self = [self initWithFrame:(CGRect){0,0, 288.0f, 44.0f}]) { }
if (self = [self initWithFrame:(CGRect){0,0, 288.0f, 52.0f}]) { }
return self;
}

Expand Down Expand Up @@ -86,7 +91,7 @@ - (instancetype)initWithContentView:(__kindof UIView *)contentView {
}

- (instancetype)initWithText:(NSString *)text {
if (self = [super initWithFrame:(CGRect){0,0, 288.0f, 44.0f}]) {
if (self = [super initWithFrame:(CGRect){0,0, 288.0f, 52.0f}]) {
_contentView = [UIView new];
[self _roundedButtonCommonInit];
[self _makeTitleLabelIfNeeded];
Expand All @@ -105,6 +110,18 @@ - (void)_roundedButtonCommonInit TOROUNDEDBUTTON_OBJC_DIRECT {
_tappedTintColorBrightnessOffset = !TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(_tappedTintColorBrightnessOffset) ?: -0.15f;
_contentInset = (UIEdgeInsets){15.0, 15.0, 15.0, 15.0};
_blurStyle = UIBlurEffectStyleDark;

// Set the corner radius depending on system version
#ifdef __IPHONE_26_0
if (@available(iOS 26.0, *)) {
_cornerConfiguration = [UICornerConfiguration capsuleConfiguration];
} else {
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
}
#else
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
#endif

#ifdef __IPHONE_13_0
if (@available(iOS 13.0, *)) { _blurStyle = UIBlurEffectStyleSystemThinMaterialDark; }
#endif
Expand Down Expand Up @@ -132,17 +149,6 @@ - (void)_roundedButtonCommonInit TOROUNDEDBUTTON_OBJC_DIRECT {
[self addTarget:self action:@selector(_didTouchUpInside) forControlEvents:UIControlEventTouchUpInside];
[self addTarget:self action:@selector(_didDragOutside) forControlEvents:UIControlEventTouchDragExit|UIControlEventTouchCancel];
[self addTarget:self action:@selector(_didDragInside) forControlEvents:UIControlEventTouchDragEnter];

// Set the corner radius depending on app version
#ifdef __IPHONE_26_0
if (@available(iOS 26.0, *)) {
self.cornerConfiguration = [UICornerConfiguration capsuleConfiguration];
} else {
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
}
#else
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
#endif
}

- (void)_makeTitleLabelIfNeeded TOROUNDEDBUTTON_OBJC_DIRECT {
Expand Down Expand Up @@ -176,6 +182,15 @@ - (UIView *)_makeBackgroundViewWithBlur:(BOOL)withBlur TOROUNDEDBUTTON_OBJC_DIRE
}
backgroundView.frame = self.bounds;
backgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;

#ifdef __IPHONE_26_0
if (@available(iOS 26.0, *)) {
backgroundView.cornerConfiguration = _cornerConfiguration;
} else {
backgroundView.layer.cornerRadius = _cornerRadius;
}
#endif

#ifdef __IPHONE_13_0
if (@available(iOS 13.0, *)) { backgroundView.layer.cornerCurve = kCACornerCurveContinuous; }
#endif
Expand Down Expand Up @@ -525,7 +540,8 @@ - (void)setCornerRadius:(CGFloat)cornerRadius {
#ifdef __IPHONE_26_0
if (@available(iOS 26.0, *)) {
UICornerRadius *const radius = [UICornerRadius fixedRadius:_cornerRadius];
_backgroundView.cornerConfiguration = [UICornerConfiguration configurationWithUniformRadius:radius];
_cornerConfiguration = [UICornerConfiguration configurationWithUniformRadius:radius];
_backgroundView.cornerConfiguration = _cornerConfiguration;
} else {
_backgroundView.layer.cornerRadius = _cornerRadius;
}
Expand All @@ -537,11 +553,12 @@ - (void)setCornerRadius:(CGFloat)cornerRadius {

#ifdef __IPHONE_26_0
- (void)setCornerConfiguration:(UICornerConfiguration *)cornerConfiguration {
_backgroundView.cornerConfiguration = cornerConfiguration;
_cornerConfiguration = cornerConfiguration;
_backgroundView.cornerConfiguration = _cornerConfiguration;
}

- (UICornerConfiguration *)cornerConfiguration {
return _backgroundView.cornerConfiguration;
return _cornerConfiguration;
}
#endif

Expand Down