Skip to content
Open
Changes from all commits
Commits
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
66 changes: 65 additions & 1 deletion Classes/ios/FUIButton.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,68 @@ @implementation FUIButton
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
self.defaultEdgeInsets = self.titleEdgeInsets;
#pragma clang diagnostic pop

if (@available(iOS 15.0, *)) {
if (self.configuration) {
self.defaultEdgeInsets = UIEdgeInsetsMake(self.configuration.contentInsets.top,
self.configuration.contentInsets.leading,
self.configuration.contentInsets.bottom,
self.configuration.contentInsets.trailing);
}
}
}
return self;
}

- (void) setTitleEdgeInsets:(UIEdgeInsets)titleEdgeInsets {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[super setTitleEdgeInsets:titleEdgeInsets];
#pragma clang diagnostic pop

self.defaultEdgeInsets = titleEdgeInsets;

if (@available(iOS 15.0, *)) {
if (self.configuration) {
UIButtonConfiguration *config = self.configuration;
config.contentInsets = NSDirectionalEdgeInsetsMake(titleEdgeInsets.top,
titleEdgeInsets.left,
titleEdgeInsets.bottom,
titleEdgeInsets.right);
self.configuration = config;
}
}

[self setShadowHeight:self.shadowHeight];
}

- (void) setHighlighted:(BOOL)highlighted {
UIEdgeInsets insets = highlighted ? self.highlightedEdgeInsets : self.normalEdgeInsets;
[super setTitleEdgeInsets:insets];

if (@available(iOS 15.0, *)) {
if (self.configuration) {
UIButtonConfiguration *config = self.configuration;
config.contentInsets = NSDirectionalEdgeInsetsMake(insets.top,
insets.left,
insets.bottom,
insets.right);
self.configuration = config;
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[super setTitleEdgeInsets:insets];
#pragma clang diagnostic pop
}
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[super setTitleEdgeInsets:insets];
#pragma clang diagnostic pop
}
[super setHighlighted:highlighted];
}

Expand Down Expand Up @@ -74,7 +122,23 @@ - (void) setShadowHeight:(CGFloat)shadowHeight {
self.highlightedEdgeInsets = insets;
insets.top -= shadowHeight * 2.0f;
self.normalEdgeInsets = insets;

if (@available(iOS 15.0, *)) {
if (self.configuration) {
UIButtonConfiguration *config = self.configuration;
config.contentInsets = NSDirectionalEdgeInsetsMake(insets.top,
insets.left,
insets.bottom,
insets.right);
self.configuration = config;
}
}

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[super setTitleEdgeInsets:insets];
#pragma clang diagnostic pop

[self configureFlatButton];
}

Expand Down