mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-29 17:10:31 +00:00
Revert "Add setNeedsLayout to yoga tree changes. (#1361)"
This reverts commit babd81bd23f24ad1e16785e2ad550d724e98c0a3.
This commit is contained in:
Garrett Moon
parent
9d77ef944f
commit
ae2b3af967
@ -23,19 +23,6 @@
|
||||
|
||||
using AS::MutexLocker;
|
||||
|
||||
@interface ASDisplayNode (ASLayoutElementStyleDelegate) <ASLayoutElementStyleDelegate>
|
||||
@end
|
||||
|
||||
@implementation ASDisplayNode (ASLayoutElementStyleDelegate)
|
||||
|
||||
#pragma mark <ASLayoutElementStyleDelegate>
|
||||
|
||||
- (void)style:(ASLayoutElementStyle *)style propertyDidChange:(NSString *)propertyName {
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - ASDisplayNode (ASLayoutElement)
|
||||
|
||||
@implementation ASDisplayNode (ASLayoutElement)
|
||||
@ -59,9 +46,8 @@ using AS::MutexLocker;
|
||||
|
||||
- (ASLayoutElementStyle *)_locked_style
|
||||
{
|
||||
ASAssertLocked(__instanceLock__);
|
||||
if (_style == nil) {
|
||||
_style = [[ASLayoutElementStyle alloc] initWithDelegate:self];
|
||||
_style = [[ASLayoutElementStyle alloc] init];
|
||||
}
|
||||
return _style;
|
||||
}
|
||||
|
||||
@ -93,7 +93,6 @@
|
||||
|
||||
// YGNodeRef removal is done in setParent:
|
||||
child.yogaParent = nil;
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (void)insertYogaChild:(ASDisplayNode *)child atIndex:(NSUInteger)index
|
||||
@ -118,7 +117,6 @@
|
||||
|
||||
// YGNodeRef insertion is done in setParent:
|
||||
child.yogaParent = self;
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
#pragma mark - Subclass Hooks
|
||||
|
||||
@ -142,18 +142,11 @@ NSString * const ASYogaAspectRatioProperty = @"ASYogaAspectRatioProperty";
|
||||
#endif
|
||||
|
||||
#define ASLayoutElementStyleSetSizeWithScope(x) \
|
||||
({ \
|
||||
__instanceLock__.lock(); \
|
||||
const ASLayoutElementSize oldSize = _size.load(); \
|
||||
ASLayoutElementSize newSize = oldSize; \
|
||||
{x}; \
|
||||
BOOL changed = !ASLayoutElementSizeEqualToLayoutElementSize(oldSize, newSize); \
|
||||
if (changed) { \
|
||||
ASLayoutElementSize newSize = _size.load(); \
|
||||
{ x } \
|
||||
_size.store(newSize); \
|
||||
} \
|
||||
__instanceLock__.unlock(); \
|
||||
changed; \
|
||||
})
|
||||
__instanceLock__.unlock();
|
||||
|
||||
#define ASLayoutElementStyleCallDelegate(propertyName)\
|
||||
do {\
|
||||
@ -211,13 +204,9 @@ do {\
|
||||
{
|
||||
self = [super init];
|
||||
if (self) {
|
||||
std::atomic_init(&_size, ASLayoutElementSizeMake());
|
||||
std::atomic_init(&_flexBasis, ASDimensionAuto);
|
||||
_size = ASLayoutElementSizeMake();
|
||||
#if YOGA
|
||||
_parentAlignStyle = ASStackLayoutAlignItemsNotSet;
|
||||
std::atomic_init(&_flexDirection, ASStackLayoutDirectionVertical);
|
||||
std::atomic_init(&_alignItems, ASStackLayoutAlignItemsStretch);
|
||||
std::atomic_init(&_aspectRatio, static_cast<CGFloat>(YGUndefined));
|
||||
#endif
|
||||
}
|
||||
return self;
|
||||
@ -249,10 +238,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setWidth:(ASDimension)width
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.width = width; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.width = width;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)height
|
||||
@ -262,10 +251,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setHeight:(ASDimension)height
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.height = height; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.height = height;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)minWidth
|
||||
@ -275,10 +264,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMinWidth:(ASDimension)minWidth
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.minWidth = minWidth; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.minWidth = minWidth;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)maxWidth
|
||||
@ -288,10 +277,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMaxWidth:(ASDimension)maxWidth
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.maxWidth = maxWidth; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.maxWidth = maxWidth;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)minHeight
|
||||
@ -301,10 +290,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMinHeight:(ASDimension)minHeight
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.minHeight = minHeight; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.minHeight = minHeight;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)maxHeight
|
||||
@ -314,10 +303,10 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMaxHeight:(ASDimension)maxHeight
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({ newSize.maxHeight = maxHeight; });
|
||||
if (changed) {
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.maxHeight = maxHeight;
|
||||
});
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -325,14 +314,12 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setPreferredSize:(CGSize)preferredSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.width = ASDimensionMakeWithPoints(preferredSize.width);
|
||||
newSize.height = ASDimensionMakeWithPoints(preferredSize.height);
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGSize)preferredSize
|
||||
@ -353,26 +340,22 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMinSize:(CGSize)minSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.minWidth = ASDimensionMakeWithPoints(minSize.width);
|
||||
newSize.minHeight = ASDimensionMakeWithPoints(minSize.height);
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setMaxSize:(CGSize)maxSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.maxWidth = ASDimensionMakeWithPoints(maxSize.width);
|
||||
newSize.maxHeight = ASDimensionMakeWithPoints(maxSize.height);
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASLayoutSize)preferredLayoutSize
|
||||
@ -383,14 +366,12 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setPreferredLayoutSize:(ASLayoutSize)preferredLayoutSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.width = preferredLayoutSize.width;
|
||||
newSize.height = preferredLayoutSize.height;
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASLayoutSize)minLayoutSize
|
||||
@ -401,14 +382,12 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMinLayoutSize:(ASLayoutSize)minLayoutSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.minWidth = minLayoutSize.width;
|
||||
newSize.minHeight = minLayoutSize.height;
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASLayoutSize)maxLayoutSize
|
||||
@ -419,23 +398,20 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setMaxLayoutSize:(ASLayoutSize)maxLayoutSize
|
||||
{
|
||||
BOOL changed = ASLayoutElementStyleSetSizeWithScope({
|
||||
ASLayoutElementStyleSetSizeWithScope({
|
||||
newSize.maxWidth = maxLayoutSize.width;
|
||||
newSize.maxHeight = maxLayoutSize.height;
|
||||
});
|
||||
if (changed) {
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - ASStackLayoutElement
|
||||
|
||||
- (void)setSpacingBefore:(CGFloat)spacingBefore
|
||||
{
|
||||
if (_spacingBefore.exchange(spacingBefore) != spacingBefore) {
|
||||
_spacingBefore.store(spacingBefore);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleSpacingBeforeProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)spacingBefore
|
||||
@ -445,9 +421,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setSpacingAfter:(CGFloat)spacingAfter
|
||||
{
|
||||
if (_spacingAfter.exchange(spacingAfter) != spacingAfter) {
|
||||
_spacingAfter.store(spacingAfter);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleSpacingAfterProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)spacingAfter
|
||||
@ -457,9 +432,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setFlexGrow:(CGFloat)flexGrow
|
||||
{
|
||||
if (_flexGrow.exchange(flexGrow) != flexGrow) {
|
||||
_flexGrow.store(flexGrow);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexGrowProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)flexGrow
|
||||
@ -469,9 +443,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setFlexShrink:(CGFloat)flexShrink
|
||||
{
|
||||
if (_flexShrink.exchange(flexShrink) != flexShrink) {
|
||||
_flexShrink.store(flexShrink);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexShrinkProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)flexShrink
|
||||
@ -481,9 +454,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setFlexBasis:(ASDimension)flexBasis
|
||||
{
|
||||
if (!ASDimensionEqualToDimension(_flexBasis.exchange(flexBasis), flexBasis)) {
|
||||
_flexBasis.store(flexBasis);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexBasisProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASDimension)flexBasis
|
||||
@ -493,9 +465,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setAlignSelf:(ASStackLayoutAlignSelf)alignSelf
|
||||
{
|
||||
if (_alignSelf.exchange(alignSelf) != alignSelf) {
|
||||
_alignSelf.store(alignSelf);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleAlignSelfProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (ASStackLayoutAlignSelf)alignSelf
|
||||
@ -505,9 +476,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setAscender:(CGFloat)ascender
|
||||
{
|
||||
if (_ascender.exchange(ascender) != ascender) {
|
||||
_ascender.store(ascender);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleAscenderProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)ascender
|
||||
@ -517,9 +487,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setDescender:(CGFloat)descender
|
||||
{
|
||||
if (_descender.exchange(descender) != descender) {
|
||||
_descender.store(descender);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleDescenderProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGFloat)descender
|
||||
@ -531,9 +500,8 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
|
||||
- (void)setLayoutPosition:(CGPoint)layoutPosition
|
||||
{
|
||||
if (!CGPointEqualToPoint(_layoutPosition.exchange(layoutPosition), layoutPosition)) {
|
||||
_layoutPosition.store(layoutPosition);
|
||||
ASLayoutElementStyleCallDelegate(ASLayoutElementStyleLayoutPositionProperty);
|
||||
}
|
||||
}
|
||||
|
||||
- (CGPoint)layoutPosition
|
||||
@ -821,64 +789,48 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
|
||||
}
|
||||
|
||||
- (void)setFlexWrap:(YGWrap)flexWrap {
|
||||
if (_flexWrap.exchange(flexWrap) != flexWrap) {
|
||||
_flexWrap.store(flexWrap);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaFlexWrapProperty);
|
||||
}
|
||||
}
|
||||
- (void)setFlexDirection:(ASStackLayoutDirection)flexDirection {
|
||||
if (_flexDirection.exchange(flexDirection) != flexDirection) {
|
||||
_flexDirection.store(flexDirection);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaFlexDirectionProperty);
|
||||
}
|
||||
}
|
||||
- (void)setDirection:(YGDirection)direction {
|
||||
if (_direction.exchange(direction) != direction) {
|
||||
_direction.store(direction);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaDirectionProperty);
|
||||
}
|
||||
}
|
||||
- (void)setJustifyContent:(ASStackLayoutJustifyContent)justify {
|
||||
if (_justifyContent.exchange(justify) != justify) {
|
||||
_justifyContent.store(justify);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaJustifyContentProperty);
|
||||
}
|
||||
}
|
||||
- (void)setAlignItems:(ASStackLayoutAlignItems)alignItems {
|
||||
if (_alignItems.exchange(alignItems) != alignItems) {
|
||||
_alignItems.store(alignItems);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaAlignItemsProperty);
|
||||
}
|
||||
}
|
||||
- (void)setPositionType:(YGPositionType)positionType {
|
||||
if (_positionType.exchange(positionType) != positionType) {
|
||||
_positionType.store(positionType);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaPositionTypeProperty);
|
||||
}
|
||||
}
|
||||
/// TODO: smart compare ASEdgeInsets instead of memory compare.
|
||||
- (void)setPosition:(ASEdgeInsets)position {
|
||||
ASEdgeInsets oldValue = _position.exchange(position);
|
||||
if (0 != memcmp(&position, &oldValue, sizeof(ASEdgeInsets))) {
|
||||
_position.store(position);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaPositionProperty);
|
||||
}
|
||||
}
|
||||
- (void)setMargin:(ASEdgeInsets)margin {
|
||||
ASEdgeInsets oldValue = _margin.exchange(margin);
|
||||
if (0 != memcmp(&margin, &oldValue, sizeof(ASEdgeInsets))) {
|
||||
_margin.store(margin);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaMarginProperty);
|
||||
}
|
||||
}
|
||||
- (void)setPadding:(ASEdgeInsets)padding {
|
||||
ASEdgeInsets oldValue = _padding.exchange(padding);
|
||||
if (0 != memcmp(&padding, &oldValue, sizeof(ASEdgeInsets))) {
|
||||
_padding.store(padding);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaPaddingProperty);
|
||||
}
|
||||
}
|
||||
- (void)setBorder:(ASEdgeInsets)border {
|
||||
ASEdgeInsets oldValue = _border.exchange(border);
|
||||
if (0 != memcmp(&border, &oldValue, sizeof(ASEdgeInsets))) {
|
||||
_border.store(border);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaBorderProperty);
|
||||
}
|
||||
}
|
||||
- (void)setAspectRatio:(CGFloat)aspectRatio {
|
||||
if (_aspectRatio.exchange(aspectRatio) != aspectRatio) {
|
||||
_aspectRatio.store(aspectRatio);
|
||||
ASLayoutElementStyleCallDelegate(ASYogaAspectRatioProperty);
|
||||
}
|
||||
}
|
||||
// private (ASLayoutElementStylePrivate.h)
|
||||
- (void)setParentAlignStyle:(ASStackLayoutAlignItems)style {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user