Added some extra optimizations to the button

Author: TimOliver

TORoundedButton/TORoundedButton.h

@@ -1,7 +1,7 @@
 //
 //  TORoundedButton.h
 //
-//  Copyright 2019-2023 Timothy Oliver. All rights reserved.
+//  Copyright 2019-2025 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
@@ -94,8 +94,8 @@ IB_DESIGNABLE @interface TORoundedButton : UIControl
 /// (Defaults to off with 1.0f).
 @property (nonatomic, assign) IBInspectable CGFloat tappedTextAlpha;
 
-/// Taking the default button background color apply a brightness offset for the tapped color 
-/// (Default is -0.1f. Set 0.0 for off).
+/// Taking the default button background color apply a brightness offset for the tapped color
+/// (Default is -0.15f. Set 0.0 for off).
 @property (nonatomic, assign) IBInspectable CGFloat tappedTintColorBrightnessOffset;
 
 /// If desired, explicity set the background color of the button when tapped (Default is nil).
@@ -111,14 +111,14 @@ IB_DESIGNABLE @interface TORoundedButton : UIControl
 @property (nonatomic, copy) void (^tappedHandler)(void);
 
 /// Create a new instance of a button that can be further configured with either text or custom subviews.
-/// The size will be 288 points wide, and 50 tall by default.
+/// The size will be 288 points wide, and 52 tall by default.
 - (instancetype)init;
 
 /// Create a new instance of a button that can be further configured with either text or custom subviews.
 - (instancetype)initWithFrame:(CGRect)frame;
 
 /// Create a new instance of a button with the provided text shown in the center.
-/// The size will be 288 points wide, and 50 tall.
+/// The size will be 288 points wide, and 52 tall.
 - (instancetype)initWithText:(NSString *)text;
 
 /// Create a new instance of a button with the provided view set as the hosting content view.

TORoundedButton/TORoundedButton.m

@@ -1,7 +1,7 @@
 //
 //  TORoundedButton.m
 //
-//  Copyright 2019-2023 Timothy Oliver. All rights reserved.
+//  Copyright 2019-2025 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
@@ -32,7 +32,7 @@ static inline BOOL TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(CGFloat value) {
 }
 
 static inline BOOL TO_ROUNDED_BUTTON_FLOATS_MATCH(CGFloat firstValue, CGFloat secondValue) {
-    return fabs(firstValue - secondValue) > FLT_EPSILON;
+    return fabs(firstValue - secondValue) < FLT_EPSILON;
 }
 
 // --------------------------------------------------------------------
@@ -104,10 +104,10 @@ - (instancetype)initWithText:(NSString *)text {
 
 - (void)_roundedButtonCommonInit TOROUNDEDBUTTON_OBJC_DIRECT {
     // Default properties (Make sure they're not overriding IB)
-    _tappedTextAlpha = (_tappedTextAlpha > FLT_EPSILON) ?: 1.0f;
-    _tapAnimationDuration = (_tapAnimationDuration > FLT_EPSILON) ?: 0.4f;
-    _tappedButtonScale = (_tappedButtonScale > FLT_EPSILON) ?: 0.97f;
-    _tappedTintColorBrightnessOffset = !TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(_tappedTintColorBrightnessOffset) ?: -0.15f;
+    _tappedTextAlpha = (_tappedTextAlpha > FLT_EPSILON) ? _tappedTextAlpha : 1.0f;
+    _tapAnimationDuration = (_tapAnimationDuration > FLT_EPSILON) ? _tapAnimationDuration : 0.4f;
+    _tappedButtonScale = (_tappedButtonScale > FLT_EPSILON) ? _tappedButtonScale : 0.97f;
+    _tappedTintColorBrightnessOffset = !TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(_tappedTintColorBrightnessOffset) ? _tappedTintColorBrightnessOffset : -0.15f;
     _contentInset = (UIEdgeInsets){15.0, 15.0, 15.0, 15.0};
     _blurStyle = UIBlurEffectStyleDark;
 
@@ -116,10 +116,10 @@ - (void)_roundedButtonCommonInit TOROUNDEDBUTTON_OBJC_DIRECT {
     if (@available(iOS 26.0, *)) {
         _cornerConfiguration = [UICornerConfiguration capsuleConfiguration];
     } else {
-        _cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
+        _cornerRadius = (_cornerRadius > FLT_EPSILON) ? _cornerRadius : 12.0f;
     }
 #else
-    _cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
+    _cornerRadius = (_cornerRadius > FLT_EPSILON) ? _cornerRadius : 12.0f;
 #endif
 
 #ifdef __IPHONE_13_0
@@ -149,6 +149,19 @@ - (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];
+
+    // Register for trait changes on iOS 17+
+#ifdef __IPHONE_17_0
+    if (@available(iOS 17.0, *)) {
+        __weak typeof(self) weakSelf = self;
+        [self registerForTraitChanges:@[UITraitUserInterfaceStyle.class]
+                          withHandler:^(id<UITraitEnvironment> _Nonnull traitEnvironment,
+                                        UITraitCollection * _Nonnull previousCollection) {
+            [weakSelf setNeedsLayout];
+            [weakSelf _updateTappedTintColorForTintColor];
+        }];
+    }
+#endif
 }
 
 - (void)_makeTitleLabelIfNeeded TOROUNDEDBUTTON_OBJC_DIRECT {
@@ -189,6 +202,8 @@ - (UIView *)_makeBackgroundViewWithBlur:(BOOL)withBlur TOROUNDEDBUTTON_OBJC_DIRE
     } else {
         backgroundView.layer.cornerRadius = _cornerRadius;
     }
+#else
+    backgroundView.layer.cornerRadius = _cornerRadius;
 #endif
 
 #ifdef __IPHONE_13_0
@@ -216,7 +231,14 @@ - (void)layoutSubviews {
     UIView *const contentView = _overrideContentView ?: _contentView;
     contentView.frame = ({
         CGRect frame = contentBounds;
+<<<<<<< Updated upstream
         frame.size = [contentView sizeThatFits:contentBounds.size];
+=======
+        const CGSize intrinsicContentSize = contentView.intrinsicContentSize;
+        if (intrinsicContentSize.width > 0.0f && intrinsicContentSize.height > 0.0f) {
+            frame.size = [contentView sizeThatFits:contentBounds.size];
+        }
+>>>>>>> Stashed changes
         frame.origin.x = (boundsSize.width - frame.size.width) * 0.5f;
         frame.origin.y = (boundsSize.height - frame.size.height) * 0.5f;
         CGRectIntegral(frame);
@@ -244,7 +266,7 @@ - (CGSize)sizeThatFits:(CGSize)size {
     const BOOL isMethodOverridden = [_contentView methodForSelector:@selector(sizeThatFits:)] !=
                                         [UIView instanceMethodForSelector:@selector(sizeThatFits:)];
     if (isMethodOverridden) {
-        newSize = [_contentView sizeThatFits:size];
+        newSize = [_contentView sizeThatFits:contentSize];
     } else if (_contentView.subviews.count == 1) {
         // When there is 1 view, we can reliably scale the whole view around it.
         newSize = [_contentView.subviews.firstObject sizeThatFits:contentSize];
@@ -269,11 +291,19 @@ - (void)tintColorDidChange {
     [self setNeedsLayout];
 }
 
+// Silence deprecation warning for iOS 17+ (we register for trait changes in init for iOS 17+)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
     [super traitCollectionDidChange:previousTraitCollection];
+    // On iOS 17+, this is handled by the trait change registration in init
+#ifdef __IPHONE_17_0
+    if (@available(iOS 17.0, *)) { return; }
+#endif
     [self setNeedsLayout];
     [self _updateTappedTintColorForTintColor];
 }
+#pragma clang diagnostic pop
 
 - (void)_updateTappedTintColorForTintColor TOROUNDEDBUTTON_OBJC_DIRECT {
     if (TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(_tappedTintColorBrightnessOffset)) {
@@ -322,7 +352,9 @@ - (void)_didTouchUpInside {
 
     // Broadcast the tap event to all subscribed objects.
     if (_tappedHandler) { _tappedHandler(); }
-    [_delegate roundedButtonDidTap:self];
+    if ([_delegate respondsToSelector:@selector(roundedButtonDidTap:)]) {
+        [_delegate roundedButtonDidTap:self];
+    }
 }
 
 - (void)_didDragOutside {