Merge branch 'master' into CollectionRefactoring

Author: Scott Goodson

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -1525,6 +1525,10 @@
 				058D09B9195D04C000B7D73C /* Frameworks */,
 				058D09BA195D04C000B7D73C /* Resources */,
 				3B9D88CDF51B429C8409E4B6 /* Copy Pods Resources */,
+<<<<<<< HEAD
+=======
+				5ADEA7587189397768F2B36C /* Embed Pods Frameworks */,
+>>>>>>> master
 			);
 			buildRules = (
 			);
@@ -1654,6 +1658,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		5ADEA7587189397768F2B36C /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

AsyncDisplayKit/ASButtonNode.h

@@ -31,6 +31,17 @@ typedef enum : NSUInteger {
  */
 @property (nonatomic, assign) BOOL laysOutHorizontally;
 
+/** Horizontally align content (text or image).
+ Defaults to ASAlignmentMiddle.
+ */
+@property (nonatomic, assign) ASHorizontalAlignment contentHorizontalAlignment;
+
+/** Vertically align content (text or image).
+ Defaults to ASAlignmentCenter.
+ */
+@property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment;
+
+
 - (NSAttributedString *)attributedTitleForState:(ASButtonState)state;
 - (void)setAttributedTitle:(NSAttributedString *)title forState:(ASButtonState)state;
 

AsyncDisplayKit/ASButtonNode.mm

@@ -39,6 +39,9 @@ - (instancetype)init
     _titleNode = [[ASTextNode alloc] init];
     _imageNode = [[ASImageNode alloc] init];
 
+    _contentHorizontalAlignment = ASAlignmentMiddle;
+    _contentVerticalAlignment = ASAlignmentCenter;
+    
     [self addSubnode:_titleNode];
     [self addSubnode:_imageNode];
 
@@ -195,8 +198,8 @@ - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
   ASStackLayoutSpec *stack = [[ASStackLayoutSpec alloc] init];
   stack.direction = self.laysOutHorizontally ? ASStackLayoutDirectionHorizontal : ASStackLayoutDirectionVertical;
   stack.spacing = self.contentSpacing;
-  stack.justifyContent = ASStackLayoutJustifyContentCenter;
-  stack.alignItems = ASStackLayoutAlignItemsCenter;
+  stack.horizontalAlignment = _contentHorizontalAlignment;
+  stack.verticalAlignment = _contentVerticalAlignment;
 
   NSMutableArray *children = [[NSMutableArray alloc] initWithCapacity:2];
   if (self.imageNode.image) {