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

add descender to ASEnvironmentMergeObjectAndState() (#2494)

Browse Source
This commit is contained in:
Hannah Troisi 2016-10-27 16:22:21 -07:00 committed by Adlai Holler
parent c0125010c1
commit c67a74ec41
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsyncDisplayKit/Private/ASEnvironmentInternal.mm
View File

@ -153,6 +153,9 @@ ASEnvironmentState ASEnvironmentMergeObjectAndState(ASEnvironmentState environme
if (parentLayoutOptionsState.ascender == defaultState.ascender) { if (parentLayoutOptionsState.ascender == defaultState.ascender) {
parentLayoutOptionsState.ascender = layoutOptionsState.ascender; parentLayoutOptionsState.ascender = layoutOptionsState.ascender;
} }
if (parentLayoutOptionsState.descender == defaultState.descender) {
parentLayoutOptionsState.descender = layoutOptionsState.descender;
}
if (CGPointEqualToPoint(parentLayoutOptionsState.layoutPosition, defaultState.layoutPosition)) { if (CGPointEqualToPoint(parentLayoutOptionsState.layoutPosition, defaultState.layoutPosition)) {
// For now it is unclear if we should be up-propagating sizeRange or layoutPosition. // For now it is unclear if we should be up-propagating sizeRange or layoutPosition.