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

Improve Swift compatibility of ASHorizontalAlignment & ASVerticalAlignment by using consistent naming

Browse Source
This commit is contained in:
Eric Jensen
2016-03-21 11:16:28 -07:00
parent bae2f232f0
commit 12da9ac6a9
5 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
AsyncDisplayKit/Private/ASStackLayoutSpecUtilities.h
View File

@@ -72,11 +72,11 @@ inline ASStackLayoutAlignItems alignment(ASStackLayoutAlignSelf childAlignment,
inline ASStackLayoutAlignItems alignment(ASHorizontalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
{
switch (alignment) {
case ASAlignmentLeft:
case ASHorizontalAlignmentLeft:
return ASStackLayoutAlignItemsStart;
case ASAlignmentMiddle:
case ASHorizontalAlignmentMiddle:
return ASStackLayoutAlignItemsCenter;
case ASAlignmentRight:
case ASHorizontalAlignmentRight:
return ASStackLayoutAlignItemsEnd;
case ASHorizontalAlignmentNone:
default:
@@ -87,11 +87,11 @@ inline ASStackLayoutAlignItems alignment(ASHorizontalAlignment alignment, ASStac
inline ASStackLayoutAlignItems alignment(ASVerticalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
{
switch (alignment) {
case ASAlignmentTop:
case ASVerticalAlignmentTop:
return ASStackLayoutAlignItemsStart;
case ASAlignmentCenter:
case ASVerticalAlignmentCenter:
return ASStackLayoutAlignItemsCenter;
case ASAlignmentBottom:
case ASVerticalAlignmentBottom:
return ASStackLayoutAlignItemsEnd;
case ASVerticalAlignmentNone:
default:
@@ -102,11 +102,11 @@ inline ASStackLayoutAlignItems alignment(ASVerticalAlignment alignment, ASStackL
inline ASStackLayoutJustifyContent justifyContent(ASHorizontalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
{
switch (alignment) {
case ASAlignmentLeft:
case ASHorizontalAlignmentLeft:
return ASStackLayoutJustifyContentStart;
case ASAlignmentMiddle:
case ASHorizontalAlignmentMiddle:
return ASStackLayoutJustifyContentCenter;
case ASAlignmentRight:
case ASHorizontalAlignmentRight:
return ASStackLayoutJustifyContentEnd;
case ASHorizontalAlignmentNone:
default:
@@ -117,11 +117,11 @@ inline ASStackLayoutJustifyContent justifyContent(ASHorizontalAlignment alignmen
inline ASStackLayoutJustifyContent justifyContent(ASVerticalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
{
switch (alignment) {
case ASAlignmentTop:
case ASVerticalAlignmentTop:
return ASStackLayoutJustifyContentStart;
case ASAlignmentCenter:
case ASVerticalAlignmentCenter:
return ASStackLayoutJustifyContentCenter;
case ASAlignmentBottom:
case ASVerticalAlignmentBottom:
return ASStackLayoutJustifyContentEnd;
case ASVerticalAlignmentNone:
default: