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 +3194 -176
70 changed files with 3194 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b498714d48 - Show all commits

37
YogaKit/Source/YGLayout.m
View File

@@ -488,9 +488,14 @@ static void YGRemoveAllChildren(const YGNodeRef node) {
YGNodeRemoveAllChildren(node); YGNodeRemoveAllChildren(node);
} }
static CGFloat YGAlignPixelValue(CGFloat value) { static inline CGPoint YGRoundPixelPosition(CGPoint p) {
CGFloat scale = YGScaleFactor(); CGFloat scale = YGScaleFactor();
return ceil(value * scale) / scale; return (CGPoint) { .x = round(p.x * scale) / scale, .y = round(p.y * scale) / scale };
}
static inline CGSize YGAlignPixelSize(CGSize s) {
CGFloat scale = YGScaleFactor();
return (CGSize) { .width = ceil(s.width * scale) / scale, .height = ceil(s.height * scale) / scale };
} }
static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) { static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
@@ -537,17 +542,9 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
: CGPointZero; : CGPointZero;
#endif #endif
CGRect frame = (CGRect){ CGRect frame = (CGRect) {
.origin = .origin = (CGPoint) { .x = topLeft.x + origin.x, .y = topLeft.y + origin.y, },
{ .size = (CGSize) { .width = MAX(bottomRight.x - topLeft.x, 0), .height = MAX(bottomRight.y - topLeft.y, 0), }
.x = topLeft.x + origin.x,
.y = topLeft.y + origin.y,
},
.size =
{
.width = MAX(bottomRight.x - topLeft.x, 0),
.height = MAX(bottomRight.y - topLeft.y, 0),
},
}; };
#if TARGET_OS_OSX #if TARGET_OS_OSX
@@ -556,19 +553,19 @@ static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
} }
view.frame = (CGRect) { view.frame = (CGRect) {
.origin = frame.origin, .origin = YGRoundPixelPosition(frame.origin),
.size = CGSizeMake(YGAlignPixelValue(frame.size.width), YGAlignPixelValue(frame.size.height)) .size = YGAlignPixelSize(frame.size)
}; };
#else #else
view.bounds = (CGRect) { view.bounds = (CGRect) {
.origin = view.bounds.origin, .origin = view.bounds.origin,
.size = CGSizeMake(YGAlignPixelValue(CGRectGetWidth(frame)), YGAlignPixelValue(CGRectGetHeight(frame))) .size = YGAlignPixelSize(frame.size)
}; };
view.center = (CGPoint) { view.center = YGRoundPixelPosition((CGPoint) {
.x = (CGFloat)(CGRectGetMinX(frame) + CGRectGetWidth(frame) * 0.5), .x = CGRectGetMinX(frame) + CGRectGetWidth(frame) * 0.5,
.y = (CGFloat)(CGRectGetMinY(frame) + CGRectGetHeight(frame) * 0.5) .y = CGRectGetMinY(frame) + CGRectGetHeight(frame) * 0.5
}; });
#endif #endif
if (!yoga.isLeaf) { if (!yoga.isLeaf) {