@@ -122,7 +122,7 @@ - (UIView *)subtitleViewOrDefault {
122
122
123
123
- (SMCalloutBackgroundView *)backgroundView {
124
124
// create our default background on first access only if it's nil, since you might have set your own background anyway.
125
- return _backgroundView ?: (_backgroundView = [self defaultBackgroundView ]);
125
+ return _backgroundView ? _backgroundView : (_backgroundView = [self defaultBackgroundView ]);
126
126
}
127
127
128
128
- (SMCalloutBackgroundView *)defaultBackgroundView {
@@ -160,7 +160,7 @@ - (CGFloat)leftAccessoryVerticalMargin {
160
160
}
161
161
162
162
- (CGFloat )leftAccessoryHorizontalMargin {
163
- return MIN (self.leftAccessoryVerticalMargin , TITLE_HMARGIN);
163
+ return fminf (self.leftAccessoryVerticalMargin , TITLE_HMARGIN);
164
164
}
165
165
166
166
- (CGFloat )rightAccessoryVerticalMargin {
@@ -171,7 +171,7 @@ - (CGFloat)rightAccessoryVerticalMargin {
171
171
}
172
172
173
173
- (CGFloat )rightAccessoryHorizontalMargin {
174
- return MIN (self.rightAccessoryVerticalMargin , TITLE_HMARGIN);
174
+ return fminf (self.rightAccessoryVerticalMargin , TITLE_HMARGIN);
175
175
}
176
176
177
177
- (CGFloat )innerContentMarginLeft {
@@ -250,7 +250,7 @@ - (CGSize)offsetToContainRect:(CGRect)innerRect inRect:(CGRect)outerRect {
250
250
CGFloat nudgeLeft = fminf (0 , CGRectGetMaxX (outerRect) - CGRectGetMaxX (innerRect));
251
251
CGFloat nudgeTop = fmaxf (0 , CGRectGetMinY (outerRect) - CGRectGetMinY (innerRect));
252
252
CGFloat nudgeBottom = fminf (0 , CGRectGetMaxY (outerRect) - CGRectGetMaxY (innerRect));
253
- return CGSizeMake (nudgeLeft ?: nudgeRight, nudgeTop ?: nudgeBottom);
253
+ return CGSizeMake (nudgeLeft ? nudgeLeft : nudgeRight, nudgeTop ? nudgeTop : nudgeBottom);
254
254
}
255
255
256
256
- (void )presentCalloutFromRect : (CGRect )rect inView : (UIView *)view constrainedToView : (UIView *)constrainedView animated : (BOOL )animated {
0 commit comments