Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shrink Button Node #1494

Merged
merged 1 commit into from
May 7, 2019
Merged

Shrink Button Node #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Source/ASButtonNode+Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@
UIImage *_disabledBackgroundImage;

CGFloat _contentSpacing;
BOOL _laysOutHorizontally;
ASVerticalAlignment _contentVerticalAlignment;
ASHorizontalAlignment _contentHorizontalAlignment;
UIEdgeInsets _contentEdgeInsets;
ASButtonNodeImageAlignment _imageAlignment;
ASTextNode *_titleNode;
ASImageNode *_imageNode;
ASImageNode *_backgroundImageNode;

BOOL _laysOutHorizontally;
bolsinga marked this conversation as resolved.
Show resolved Hide resolved
ASVerticalAlignment _contentVerticalAlignment;
ASHorizontalAlignment _contentHorizontalAlignment;
ASButtonNodeImageAlignment _imageAlignment;
}

@end
2 changes: 1 addition & 1 deletion Source/ASButtonNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
Image alignment defines where the image will be placed relative to the text.
*/
typedef NS_ENUM(NSInteger, ASButtonNodeImageAlignment) {
typedef NS_ENUM(unsigned char, ASButtonNodeImageAlignment) {
/** Places the image before the text. */
ASButtonNodeImageAlignmentBeginning,
/** Places the image after the text. */
Expand Down
4 changes: 2 additions & 2 deletions Source/Layout/ASStackLayoutDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ typedef NS_ENUM(NSUInteger, ASStackLayoutAlignContent) {
};

/** Orientation of children along horizontal axis */
typedef NS_ENUM(NSUInteger, ASHorizontalAlignment) {
typedef NS_ENUM(unsigned char, ASHorizontalAlignment) {
/** No alignment specified. Default value */
ASHorizontalAlignmentNone,
/** Left aligned */
Expand All @@ -128,7 +128,7 @@ typedef NS_ENUM(NSUInteger, ASHorizontalAlignment) {
};

/** Orientation of children along vertical axis */
typedef NS_ENUM(NSUInteger, ASVerticalAlignment) {
typedef NS_ENUM(unsigned char, ASVerticalAlignment) {
/** No alignment specified. Default value */
ASVerticalAlignmentNone,
/** Top aligned */
Expand Down