ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #636 from nguyenhuy/fixSetNeedsLayout

Browse Source 
Use getters and setters while adjusting position of a node
This commit is contained in:
appleguy
2015-10-01 18:08:28 -07:00
parent c8518c7fa6 22fba5a108
commit fd88522f84
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AsyncDisplayKit/ASDisplayNode.mm
View File

@@ -672,25 +672,20 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
// This is the root node. Trigger a full measurement pass on *current* thread. Old constrained size is re-used.
[self measureWithSizeRange:oldConstrainedSize];
CGSize oldSize = self.bounds.size;
CGRect oldBounds = self.bounds;
CGSize oldSize = oldBounds.size;
CGSize newSize = _layout.size;
if (! CGSizeEqualToSize(oldSize, newSize)) {
CGRect bounds = self.bounds;
bounds.size = newSize;
self.bounds = bounds;
self.bounds = (CGRect){ oldBounds.origin, newSize };
// Frame's origin must be preserved. Since it is computed from bounds size, anchorPoint
// and position (see frame setter in ASDisplayNode+UIViewBridge), position needs to be adjusted.
BOOL useLayer = (_layer && ASDisplayNodeThreadIsMain());
CGPoint anchorPoint = (useLayer ? _layer.anchorPoint : self.anchorPoint);
CGPoint oldPosition = (useLayer ? _layer.position : self.position);
CGPoint anchorPoint = self.anchorPoint;
CGPoint oldPosition = self.position;
CGFloat xDelta = (newSize.width - oldSize.width) * anchorPoint.x;
CGFloat yDelta = (newSize.height - oldSize.height) * anchorPoint.y;
CGPoint newPosition = CGPointMake(oldPosition.x + xDelta, oldPosition.y + yDelta);
useLayer ? _layer.position = newPosition : self.position = newPosition;
self.position = CGPointMake(oldPosition.x + xDelta, oldPosition.y + yDelta);
}
}
}