Skip to content

Commit 60b59ef

Browse files
protosseprotosse
committed
fix macOS build error
1 parent 80d7fd1 commit 60b59ef

File tree

3 files changed

+37
-91
lines changed

3 files changed

+37
-91
lines changed

‎Example/PinLayoutSample/UI/Examples/IntroObjectiveC/IntroObjectiveCView.m‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ - (void) layoutSubviews {
6767

6868
CGFloat margin = 10;
6969
UIEdgeInsets safeArea = self.pinObjc.safeArea;
70-
71-
// [[[[[[logo.pinObjc topWithInsets:safeArea] leftWithInsets:safeArea] width:100] aspectRatio] margin:margin] layout];
72-
// [[[[segmented.pinObjc rightOf:logo aligned:VerticalAlignTop] rightWithInsets:safeArea] marginHorizontal:margin] layout];
73-
// [[[[[[textLabel.pinObjc belowOf:segmented aligned:HorizontalAlignLeft] widthOf:segmented] pinEdges] marginTop:margin] sizeToFit:FitWidth] layout];
74-
// [[[[[separatorView.pinObjc belowOfViews:@[logo, textLabel] aligned:HorizontalAlignLeft] rightTo:segmented.edge.right] height:1] marginTop:margin] layout];
70+
7571
logo.pinObjc
7672
.topInsets(safeArea)
7773
.leftInsets(safeArea)

‎Sources/ObjectiveC/PinLayoutObjC.swift‎

Lines changed: 34 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -159,81 +159,49 @@ import AppKit
159159
// MARK: Layout using relative positioning
160160
//
161161
#if os(iOS) || os(tvOS)
162-
163162
typealias POView = (_ view: UIView) -> PinLayoutObjC?
164163
typealias POViews = (_ views: [UIView]) -> PinLayoutObjC?
165164
typealias POViewHAligned = (_ view: UIView, _ aligned: HorizontalAlign) -> PinLayoutObjC?
166165
typealias POViewsHAligned = (_ views: [UIView], _ aligned: HorizontalAlign) -> PinLayoutObjC?
167166
typealias POViewVAligned = (_ view: UIView, _ aligned: VerticalAlign) -> PinLayoutObjC?
168167
typealias POViewsVAligned = (_ views: [UIView], _ aligned: VerticalAlign) -> PinLayoutObjC?
169-
170-
var aboveOf: POView { get }
171-
var aboveOfViews: POViews { get }
172-
var aboveOfAligned: POViewHAligned { get }
173-
var aboveOfViewsAligned: POViewsHAligned { get }
174-
175-
var belowOf: POView { get }
176-
var belowOfViews: POViews { get }
177-
var belowOfAligned: POViewHAligned { get }
178-
var belowOfViewsAligned: POViewsHAligned { get }
179-
180-
var leftOf: POView { get }
181-
var leftOfViews: POViews { get }
182-
var leftOfAligned: POViewVAligned { get }
183-
var leftOfViewsAligned: POViewsVAligned { get }
184-
185-
var rightOf: POView { get }
186-
var rightOfViews: POViews { get }
187-
var rightOfAligned: POViewVAligned { get }
188-
var rightOfViewsAligned: POViewsVAligned { get }
189-
190-
// RTL support
191-
var beforeOf: POView { get }
192-
var beforeOfViews: POViews { get }
193-
var beforeOfAligned: POViewVAligned { get }
194-
var beforeOfViewsAligned: POViewsVAligned { get }
195-
var afterOf: POView { get }
196-
var afterOfViews: POViews { get }
197-
var afterOfAligned: POViewVAligned { get }
198-
var afterOfViewsAligned: POViewsVAligned { get }
199168
#elseif os(macOS)
200-
201169
typealias POView = (_ view: NSView) -> PinLayoutObjC?
202170
typealias POViews = (_ views: [NSView]) -> PinLayoutObjC?
203171
typealias POViewHAligned = (_ view: NSView, _ aligned: HorizontalAlign) -> PinLayoutObjC?
204172
typealias POViewsHAligned = (_ views: [NSView], _ aligned: HorizontalAlign) -> PinLayoutObjC?
205173
typealias POViewVAligned = (_ view: NSView, _ aligned: VerticalAlign) -> PinLayoutObjC?
206174
typealias POViewsVAligned = (_ views: [NSView], _ aligned: VerticalAlign) -> PinLayoutObjC?
207-
208-
var aboveOf: POView { get }
209-
var aboveOfViews: POViews { get }
210-
var aboveOfAligned: POViewHAligned { get }
211-
var aboveOfViewsAligned: POViewsHAligned { get }
212-
213-
var belowOf: POView { get }
214-
var belowOfViews: POViews { get }
215-
var belowOfAligned: POViewHAligned { get }
216-
var belowOfViewsAligned: POViewsHAligned { get }
217-
var leftOf: POView { get }
218-
var leftOfViews: POViews { get }
219-
var leftOfAligned: POViewVAligned { get }
220-
var leftOfViewsAligned: POViewsVAligned { get }
221-
222-
var rightOf: POView { get }
223-
var rightOfViews: POViews { get }
224-
var rightOfAligned: POViewVAligned { get }
225-
var rightOfViewsAligned: POViewsVAligned { get }
226-
227-
// RTL support
228-
var beforeOf: POView { get }
229-
var beforeOfViews: POViews { get }
230-
var beforeOfAligned: POViewVAligned { get }
231-
var beforeOfViewsAligned: POViewsVAligned { get }
232-
var afterOf: POView { get }
233-
var afterOfViews: POViews { get }
234-
var afterOfAligned: POViewVAligned { get }
235-
var afterOfViewsAligned: POViewsVAligned { get }
236175
#endif
176+
177+
var aboveOf: POView { get }
178+
var aboveOfViews: POViews { get }
179+
var aboveOfAligned: POViewHAligned { get }
180+
var aboveOfViewsAligned: POViewsHAligned { get }
181+
182+
var belowOf: POView { get }
183+
var belowOfViews: POViews { get }
184+
var belowOfAligned: POViewHAligned { get }
185+
var belowOfViewsAligned: POViewsHAligned { get }
186+
var leftOf: POView { get }
187+
var leftOfViews: POViews { get }
188+
var leftOfAligned: POViewVAligned { get }
189+
var leftOfViewsAligned: POViewsVAligned { get }
190+
191+
var rightOf: POView { get }
192+
var rightOfViews: POViews { get }
193+
var rightOfAligned: POViewVAligned { get }
194+
var rightOfViewsAligned: POViewsVAligned { get }
195+
196+
// RTL support
197+
var beforeOf: POView { get }
198+
var beforeOfViews: POViews { get }
199+
var beforeOfAligned: POViewVAligned { get }
200+
var beforeOfViewsAligned: POViewsVAligned { get }
201+
var afterOf: POView { get }
202+
var afterOfViews: POViews { get }
203+
var afterOfAligned: POViewVAligned { get }
204+
var afterOfViewsAligned: POViewsVAligned { get }
237205

238206
//
239207
// MARK: justify / align
@@ -246,11 +214,7 @@ import AppKit
246214
//
247215
var width: POValue { get }
248216
var widthPercent: POValue { get }
249-
#if os(iOS) || os(tvOS)
250-
var widthOf: POView { get }
251-
#elseif os(macOS)
252-
var widthOf: POView { get }
253-
#endif
217+
var widthOf: POView { get }
254218

255219
var minWidth: POValue { get }
256220
var minWidthPercent: POValue { get }
@@ -259,11 +223,7 @@ import AppKit
259223

260224
var height: POValue { get }
261225
var heightPercent: POValue { get }
262-
#if os(iOS) || os(tvOS)
263-
var heightOf: POView { get }
264-
#elseif os(macOS)
265-
var heightOf: POView { get }
266-
#endif
226+
var heightOf: POView { get }
267227

268228
var minHeight: POValue { get }
269229
var minHeightPercent: POValue { get }
@@ -273,11 +233,7 @@ import AppKit
273233
var size: POSize { get }
274234
var sizeLength: POValue { get }
275235
var sizePercent: POValue { get }
276-
#if os(iOS) || os(tvOS)
277-
var sizeOf: POView{ get }
278-
#elseif os(macOS)
279-
var sizeOf: POView{ get }
280-
#endif
236+
var sizeOf: POView{ get }
281237

282238
//
283239
// MARK: wrapContent
@@ -310,11 +266,7 @@ import AppKit
310266
* AspectRatio respects the min (minWidth/minHeight) and the max (maxWidth/maxHeight)
311267
dimensions of an item.
312268
*/
313-
#if os(iOS) || os(tvOS)
314-
var aspectRatioOf: POView { get }
315-
#elseif os(macOS)
316-
var aspectRatioOf: POView { get }
317-
#endif
269+
var aspectRatioOf: POView { get }
318270

319271
/**
320272
If the layouted view is an UIImageView, this method will set the aspectRatio using
@@ -387,11 +339,7 @@ import AppKit
387339
Set all margins using UIEdgeInsets.
388340
This method is particularly useful to set all margins using iOS 11 `UIView.safeAreaInsets`.
389341
*/
390-
#if os(iOS) || os(tvOS)
391-
var marginInsets: POEdgeInsets { get }
392-
#elseif os(macOS)
393-
var marginInsets: POEdgeInsets { get }
394-
#endif
342+
var marginInsets: POEdgeInsets { get }
395343

396344
/**
397345
Set margins using NSDirectionalEdgeInsets.

‎Sources/ObjectiveC/PinLayoutObjCImpl.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,12 +939,14 @@ import AppKit
939939
}
940940
}
941941

942+
#if os(iOS) || os(tvOS)
942943
var aspectRatio: POVoid {
943944
return { [weak self] in
944945
_ = self?.impl?.aspectRatio()
945946
return self
946947
}
947948
}
949+
#endif
948950

949951
var sizeToFit: POVoid {
950952
return { [weak self] in

0 commit comments

Comments
 (0)