ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
This commit is contained in:
Adlai Holler
2015-12-01 16:45:25 -08:00
parent 628bb7eb3a f669dddd88
commit fdfe18873a
139 changed files with 4747 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AsyncDisplayKit/Layout/ASStackLayoutSpec.h
View File

@@ -36,10 +36,25 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface ASStackLayoutSpec : ASLayoutSpec
/** Specifies the direction children are stacked in. */
/**
Specifies the direction children are stacked in. If horizontalAlignment and verticalAlignment were set,
they will be resolved again, causing justifyContent and alignItems to be updated accordingly
*/
@property (nonatomic, assign) ASStackLayoutDirection direction;
/** The amount of space between each child. */
@property (nonatomic, assign) CGFloat spacing;
/**
Specifies how children are aligned horizontally. Depends on the stack direction, setting the alignment causes either
justifyContent or alignItems to be updated. The alignment will remain valid after future direction changes.
Thus, it is preferred to those properties
*/
@property (nonatomic, assign) ASHorizontalAlignment horizontalAlignment;
/**
Specifies how children are aligned vertically. Depends on the stack direction, setting the alignment causes either
justifyContent or alignItems to be updated. The alignment will remain valid after future direction changes.
Thus, it is preferred to those properties
*/
@property (nonatomic, assign) ASVerticalAlignment verticalAlignment;
/** The amount of space between each child. */
@property (nonatomic, assign) ASStackLayoutJustifyContent justifyContent;
/** Orientation of children along cross axis */