From eab0fc200bf9c4188fd6442a82dc5f5dcce7a643 Mon Sep 17 00:00:00 2001 From: Andrew Yates Date: Wed, 17 Oct 2018 08:02:47 -0700 Subject: [PATCH] Migrate placeholder example project from 1.0 to 2.x (#1164) --- examples_extra/Placeholders/Sample/PostNode.m | 4 ++-- examples_extra/Placeholders/Sample/ViewController.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples_extra/Placeholders/Sample/PostNode.m b/examples_extra/Placeholders/Sample/PostNode.m index 27809b471d..5c8bbd6dad 100644 --- a/examples_extra/Placeholders/Sample/PostNode.m +++ b/examples_extra/Placeholders/Sample/PostNode.m @@ -72,8 +72,8 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize { - CGSize textSize = [_textNode measure:constrainedSize]; - CGSize shareSize = [_needyChildNode measure:constrainedSize]; + CGSize textSize = [_textNode layoutThatFits:ASSizeRangeMake(CGSizeZero, constrainedSize)].size; + CGSize shareSize = [_needyChildNode layoutThatFits:ASSizeRangeMake(CGSizeZero, constrainedSize)].size; return CGSizeMake(constrainedSize.width, textSize.height + 10.0 + shareSize.height); } diff --git a/examples_extra/Placeholders/Sample/ViewController.m b/examples_extra/Placeholders/Sample/ViewController.m index f1177963bb..d10f83c55d 100644 --- a/examples_extra/Placeholders/Sample/ViewController.m +++ b/examples_extra/Placeholders/Sample/ViewController.m @@ -61,8 +61,8 @@ CGFloat constrainedWidth = CGRectGetWidth(bounds); CGSize constrainedSize = CGSizeMake(constrainedWidth - 2 * padding, CGFLOAT_MAX); - CGSize postSize = [_postNode measure:constrainedSize]; - CGSize imageSize = [_imageNode measure:constrainedSize]; + CGSize postSize = [_postNode layoutThatFits:ASSizeRangeMake(CGSizeZero, constrainedSize)].size; + CGSize imageSize = [_imageNode layoutThatFits:ASSizeRangeMake(CGSizeZero, constrainedSize)].size; _imageNode.frame = (CGRect){padding, padding, imageSize}; _postNode.frame = (CGRect){padding, CGRectGetMaxY(_imageNode.frame) + 10.0, postSize};