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

[Yoga Beta] Improvements to the experimental support for Yoga layout. #59

Merged
merged 10 commits into from
Apr 27, 2017
Merged

[Yoga Beta] Improvements to the experimental support for Yoga layout. #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
605e369
[Yoga Beta] Improvements to the experimental support for Yoga layout.
appleguy Apr 23, 2017
de4f1f0
[RTL] Bridge the UISemanticContentAttribute property for more conveni…
appleguy Apr 23, 2017
5cdf50d
Merge branch 'SemanticContent' into RTL
appleguy Apr 23, 2017
8cac04c
Remove RTL property addition and depend on PR #60 landing first.
appleguy Apr 23, 2017
26bd1b3
Merge branch 'master' into YogaUpdates
appleguy Apr 25, 2017
64adecb
Merge branch 'master' into YogaUpdates
garrettmoon Apr 26, 2017
75287ce
Fix warnings
maicki Apr 27, 2017
aee040b
Add line to changelog
maicki Apr 27, 2017
e2a13a7
Merge branch 'master' into YogaUpdates
maicki Apr 27, 2017
478f473
Merge branch 'master' into YogaUpdates
maicki Apr 27, 2017
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
Prev Previous commit
Next Next commit
Fix warnings
  • Loading branch information
@maicki
maicki committed Apr 27, 2017
commit 75287ce8e7ab087c3d140237e286a79b163439ef
2 changes: 1 addition & 1 deletion Source/ASDisplayNode+Yoga.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
{
if (self.yogaParent) {
if (ASHierarchyStateIncludesYogaLayoutMeasuring(self.hierarchyState) == NO) {
[self setNeedsLayoutFromAbove];
[self _setNeedsLayoutFromAbove];
}
return;
}
Expand Down
1 change: 1 addition & 0 deletions Source/Layout/ASDimension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#pragma once
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <AsyncDisplayKit/ASAvailability.h>
#import <AsyncDisplayKit/ASBaseDefines.h>
#import <AsyncDisplayKit/ASAssert.h>

Expand Down
2 changes: 1 addition & 1 deletion Source/Private/ASDisplayNode+FrameworkPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ __unused static NSString * _Nonnull NSStringFromASHierarchyState(ASHierarchyStat
* @discussion The size of a root node is determined by each subnode. Calling invalidateSize will let the root node know
* that the intrinsic size of the receiver node is no longer valid and a resizing of the root node needs to happen.
*/
- (void)setNeedsLayoutFromAbove;
- (void)_setNeedsLayoutFromAbove;

/**
* @abstract Subclass hook for nodes that are acting as root nodes. This method is called if one of the subnodes
Expand Down