From 108ce6d8fcfbf394d8bfca740060cc9176b3224c Mon Sep 17 00:00:00 2001 From: Rajinder Ramgarhia Date: Mon, 21 Dec 2015 10:03:32 -0500 Subject: [PATCH] Set horizontal & vertical alignment default to center. Use ivar to set layout. --- AsyncDisplayKit/ASButtonNode.h | 4 ++-- AsyncDisplayKit/ASButtonNode.mm | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/AsyncDisplayKit/ASButtonNode.h b/AsyncDisplayKit/ASButtonNode.h index 55b3948f2e..57b7caf130 100644 --- a/AsyncDisplayKit/ASButtonNode.h +++ b/AsyncDisplayKit/ASButtonNode.h @@ -31,12 +31,12 @@ typedef enum : NSUInteger { */ @property (nonatomic, assign) BOOL laysOutHorizontally; -/** Horizontally align content(text or image). +/** Horizontally align content (text or image). Defaults to ASAlignmentMiddle. */ @property (nonatomic, assign) ASHorizontalAlignment contentHorizontalAlignment; -/** Vertically align content(text or image). +/** Vertically align content (text or image). Defaults to ASAlignmentCenter. */ @property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment; diff --git a/AsyncDisplayKit/ASButtonNode.mm b/AsyncDisplayKit/ASButtonNode.mm index 17431576ce..196216a6d5 100644 --- a/AsyncDisplayKit/ASButtonNode.mm +++ b/AsyncDisplayKit/ASButtonNode.mm @@ -39,6 +39,9 @@ _titleNode = [[ASTextNode alloc] init]; _imageNode = [[ASImageNode alloc] init]; + _contentHorizontalAlignment = ASAlignmentMiddle; + _contentVerticalAlignment = ASAlignmentCenter; + [self addSubnode:_titleNode]; [self addSubnode:_imageNode]; @@ -195,8 +198,8 @@ ASStackLayoutSpec *stack = [[ASStackLayoutSpec alloc] init]; stack.direction = self.laysOutHorizontally ? ASStackLayoutDirectionHorizontal : ASStackLayoutDirectionVertical; stack.spacing = self.contentSpacing; - stack.horizontalAlignment = self.contentHorizontalAlignment ? self.contentHorizontalAlignment : ASAlignmentMiddle; - stack.verticalAlignment = self.contentVerticalAlignment ? self.contentVerticalAlignment : ASAlignmentCenter; + stack.horizontalAlignment = _contentHorizontalAlignment; + stack.verticalAlignment = _contentVerticalAlignment; NSMutableArray *children = [[NSMutableArray alloc] initWithCapacity:2]; if (self.imageNode.image) {