Merge latest master and update Layout headers

This commit is contained in:
Adlai Holler
2015-09-17 11:39:59 -07:00
parent cde790124d
commit 717df1cfd2
16 changed files with 78 additions and 19 deletions

View File

@@ -34,6 +34,8 @@ typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecSizingOptions) {
ASCenterLayoutSpecSizingOptionMinimumXY = ASCenterLayoutSpecSizingOptionMinimumX | ASCenterLayoutSpecSizingOptionMinimumY,
};
NS_ASSUME_NONNULL_BEGIN
/** Lays out a single layoutable child and position it so that it is centered into the layout bounds. */
@interface ASCenterLayoutSpec : ASLayoutSpec
@@ -54,3 +56,5 @@ typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecSizingOptions) {
child:(id<ASLayoutable>)child;
@end
NS_ASSUME_NONNULL_END