Skip to content

Commit e68349d

Browse files
authored
Merge pull request #199 from OhKanghoon/make-public-margin-padding
Change the access control of margin padding functions
2 parents 1802138 + 550c546 commit e68349d

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

Sources/Swift/FlexLayout.swift

+16-9
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ public final class Flex {
874874
*/
875875
@available(tvOS 11.0, iOS 11.0, *)
876876
@discardableResult
877-
func margin(_ directionalInsets: NSDirectionalEdgeInsets) -> Flex {
877+
public func margin(_ directionalInsets: NSDirectionalEdgeInsets) -> Flex {
878878
yoga.marginTop = YGValue(directionalInsets.top)
879879
yoga.marginStart = YGValue(directionalInsets.leading)
880880
yoga.marginBottom = YGValue(directionalInsets.bottom)
@@ -900,13 +900,15 @@ public final class Flex {
900900
/**
901901
Set the individually vertical margins (top, bottom) and horizontal margins (left, right, start, end).
902902
*/
903-
@discardableResult func margin(_ vertical: CGFloat, _ horizontal: CGFloat) -> Flex {
903+
@discardableResult
904+
public func margin(_ vertical: CGFloat, _ horizontal: CGFloat) -> Flex {
904905
yoga.marginVertical = YGValue(vertical)
905906
yoga.marginHorizontal = YGValue(horizontal)
906907
return self
907908
}
908909

909-
@discardableResult func margin(_ vertical: FPercent, _ horizontal: FPercent) -> Flex {
910+
@discardableResult
911+
public func margin(_ vertical: FPercent, _ horizontal: FPercent) -> Flex {
910912
yoga.marginVertical = YGValue(value: Float(vertical.value), unit: .percent)
911913
yoga.marginHorizontal = YGValue(value: Float(horizontal.value), unit: .percent)
912914
return self
@@ -915,14 +917,16 @@ public final class Flex {
915917
/**
916918
Set the individually top, horizontal margins and bottom margin.
917919
*/
918-
@discardableResult func margin(_ top: CGFloat, _ horizontal: CGFloat, _ bottom: CGFloat) -> Flex {
920+
@discardableResult
921+
public func margin(_ top: CGFloat, _ horizontal: CGFloat, _ bottom: CGFloat) -> Flex {
919922
yoga.marginTop = YGValue(top)
920923
yoga.marginHorizontal = YGValue(horizontal)
921924
yoga.marginBottom = YGValue(bottom)
922925
return self
923926
}
924927

925-
@discardableResult func margin(_ top: FPercent, _ horizontal: FPercent, _ bottom: FPercent) -> Flex {
928+
@discardableResult
929+
public func margin(_ top: FPercent, _ horizontal: FPercent, _ bottom: FPercent) -> Flex {
926930
yoga.marginTop = YGValue(value: Float(top.value), unit: .percent)
927931
yoga.marginHorizontal = YGValue(value: Float(horizontal.value), unit: .percent)
928932
yoga.marginBottom = YGValue(value: Float(bottom.value), unit: .percent)
@@ -1103,7 +1107,7 @@ public final class Flex {
11031107
*/
11041108
@available(tvOS 11.0, iOS 11.0, *)
11051109
@discardableResult
1106-
func padding(_ directionalInsets: NSDirectionalEdgeInsets) -> Flex {
1110+
public func padding(_ directionalInsets: NSDirectionalEdgeInsets) -> Flex {
11071111
yoga.paddingTop = YGValue(directionalInsets.top)
11081112
yoga.paddingStart = YGValue(directionalInsets.leading)
11091113
yoga.paddingBottom = YGValue(directionalInsets.bottom)
@@ -1129,7 +1133,8 @@ public final class Flex {
11291133
/**
11301134
Set the individually vertical paddings (top, bottom) and horizontal paddings (left, right, start, end).
11311135
*/
1132-
@discardableResult func padding(_ vertical: CGFloat, _ horizontal: CGFloat) -> Flex {
1136+
@discardableResult
1137+
public func padding(_ vertical: CGFloat, _ horizontal: CGFloat) -> Flex {
11331138
yoga.paddingVertical = YGValue(vertical)
11341139
yoga.paddingHorizontal = YGValue(horizontal)
11351140
return self
@@ -1145,14 +1150,16 @@ public final class Flex {
11451150
/**
11461151
Set the individually top, horizontal paddings and bottom padding.
11471152
*/
1148-
@discardableResult func padding(_ top: CGFloat, _ horizontal: CGFloat, _ bottom: CGFloat) -> Flex {
1153+
@discardableResult
1154+
public func padding(_ top: CGFloat, _ horizontal: CGFloat, _ bottom: CGFloat) -> Flex {
11491155
yoga.paddingTop = YGValue(top)
11501156
yoga.paddingHorizontal = YGValue(horizontal)
11511157
yoga.paddingBottom = YGValue(bottom)
11521158
return self
11531159
}
11541160

1155-
@discardableResult func padding(_ top: FPercent, _ horizontal: FPercent, _ bottom: FPercent) -> Flex {
1161+
@discardableResult
1162+
public func padding(_ top: FPercent, _ horizontal: FPercent, _ bottom: FPercent) -> Flex {
11561163
yoga.paddingTop = YGValue(value: Float(top.value), unit: .percent)
11571164
yoga.paddingHorizontal = YGValue(value: Float(horizontal.value), unit: .percent)
11581165
yoga.paddingBottom = YGValue(value: Float(bottom.value), unit: .percent)

0 commit comments

Comments
 (0)