DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

[YogaKit] support macOS, tvOS, Carthage; auto apply layout like AutoLayout. #1026

Closed
cntrump wants to merge 38 commits from yogakit_autoapplylayout_patch into main
pull from: yogakit_autoapplylayout_patch
merge into: DaddyFrosty:main
Conversation 3 Commits 38 Files Changed 96 +3201 -171
70 changed files with 3201 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c302e34ee0 - Show all commits

14
YogaKit/Source/YGLayout.m
View File

@@ -522,8 +522,8 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
} : CGPointZero; } : CGPointZero;
const CGPoint bottomRight = { const CGPoint bottomRight = {
topLeft.x + YGNodeLayoutGetWidth(node), .x = (CGFloat)(topLeft.x + YGNodeLayoutGetWidth(node)),
topLeft.y + YGNodeLayoutGetHeight(node), .y = (CGFloat)(topLeft.y + YGNodeLayoutGetHeight(node)),
}; };
#if TARGET_OS_OSX #if TARGET_OS_OSX
@@ -531,8 +531,8 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
#else #else
// use bounds/center and not frame if non-identity transform. // use bounds/center and not frame if non-identity transform.
const CGPoint origin = preserveOrigin ? (CGPoint) { const CGPoint origin = preserveOrigin ? (CGPoint) {
.x = view.center.x - CGRectGetWidth(view.bounds) * 0.5, .x = (CGFloat)(view.center.x - CGRectGetWidth(view.bounds) * 0.5),
.y = view.center.y - CGRectGetHeight(view.bounds) * 0.5 .y = (CGFloat)(view.center.y - CGRectGetHeight(view.bounds) * 0.5)
} }
: CGPointZero; : CGPointZero;
#endif #endif
@@ -552,7 +552,7 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
#if TARGET_OS_OSX #if TARGET_OS_OSX
if (!view.superview.isFlipped && view.superview.isYogaEnabled && view.superview.yoga.isEnabled) { if (!view.superview.isFlipped && view.superview.isYogaEnabled && view.superview.yoga.isEnabled) {
frame.origin.y = YGNodeLayoutGetHeight(view.superview.yoga.node) - CGRectGetMaxY(frame); frame.origin.y = (CGFloat)(YGNodeLayoutGetHeight(view.superview.yoga.node) - CGRectGetMaxY(frame));
} }
view.frame = (CGRect) { view.frame = (CGRect) {
@@ -566,8 +566,8 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
}; };
view.center = (CGPoint) { view.center = (CGPoint) {
.x = CGRectGetMinX(frame) + CGRectGetWidth(frame) * 0.5, .x = (CGFloat)(CGRectGetMinX(frame) + CGRectGetWidth(frame) * 0.5),
.y = CGRectGetMinY(frame) + CGRectGetHeight(frame) * 0.5 .y = (CGFloat)(CGRectGetMinY(frame) + CGRectGetHeight(frame) * 0.5)
}; };
#endif #endif