mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename insets -> inset and deprecate insets

This commit is contained in:
Robert Payne 2015-04-12 18:27:52 +12:00
parent 18851b7ecd
commit b0c5280e16
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/ConstraintBuilder.swift
View File

@ -84,6 +84,9 @@ public protocol ConstraintBuilderOffsetable: ConstraintBuilderMultipliable {
func offset(amount: CGSize) -> ConstraintBuilderMultipliable func offset(amount: CGSize) -> ConstraintBuilderMultipliable
func offset(amount: EdgeInsets) -> ConstraintBuilderMultipliable func offset(amount: EdgeInsets) -> ConstraintBuilderMultipliable
func inset(amount: EdgeInsets) -> ConstraintBuilderMultipliable
@availability(*, deprecated=0.10.0, renamed="inset")
func insets(amount: EdgeInsets) -> ConstraintBuilderMultipliable func insets(amount: EdgeInsets) -> ConstraintBuilderMultipliable
} }
@ -420,12 +423,15 @@ final internal class ConstraintBuilder: Constraint, ConstraintBuilderExtendable,
return self return self
} }
// MARK: insets // MARK: inset
func insets(amount: EdgeInsets) -> ConstraintBuilderMultipliable { func inset(amount: EdgeInsets) -> ConstraintBuilderMultipliable {
self.constant = EdgeInsets(top: amount.top, left: amount.left, bottom: -amount.bottom, right: -amount.right) self.constant = EdgeInsets(top: amount.top, left: amount.left, bottom: -amount.bottom, right: -amount.right)
return self return self
} }
func insets(amount: EdgeInsets) -> ConstraintBuilderMultipliable {
return self.inset(amount)
}
// MARK: Constraint // MARK: Constraint
@ -764,8 +770,8 @@ private extension NSLayoutAttribute {
case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return insets.top case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return insets.top
case .Right, .RightMargin: return insets.right case .Right, .RightMargin: return insets.right
case .Bottom, .BottomMargin: return insets.bottom case .Bottom, .BottomMargin: return insets.bottom
case .Leading, .LeadingMargin: return insets.left case .Leading, .LeadingMargin: return (Config.interfaceLayoutDirection == .LeftToRight) ? insets.left : -insets.right
case .Trailing, .TrailingMargin: return insets.right case .Trailing, .TrailingMargin: return (Config.interfaceLayoutDirection == .LeftToRight) ? insets.right : -insets.left
case .Width, .Height, .NotAnAttribute: return CGFloat(0) case .Width, .Height, .NotAnAttribute: return CGFloat(0)
} }
#else #else
@ -774,8 +780,8 @@ private extension NSLayoutAttribute {
case .Top, .CenterY, .Baseline: return insets.top case .Top, .CenterY, .Baseline: return insets.top
case .Right: return insets.right case .Right: return insets.right
case .Bottom: return insets.bottom case .Bottom: return insets.bottom
case .Leading: return insets.left case .Leading, .LeadingMargin: return (Config.interfaceLayoutDirection == .LeftToRight) ? insets.left : -insets.right
case .Trailing: return insets.right case .Trailing, .TrailingMargin: return (Config.interfaceLayoutDirection == .LeftToRight) ? insets.right : -insets.left
case .Width, .Height, .NotAnAttribute: return CGFloat(0) case .Width, .Height, .NotAnAttribute: return CGFloat(0)
} }
#endif #endif