7 Commits

Author SHA1 Message Date
Eric Jensen
5be3b0137a Add nullability attributes to ASTextNode+Beta 2016-03-25 22:33:13 -07:00
rcancro
8dbc8b7df4 reordered conditionals, moved beta things to beta header file 2016-02-24 08:06:10 -08:00
rcancro
878fedd8f3 Stopped trying to cache the currentScaleFactor
Was running into issues where the scale factor would get cleared when setting a new atributedString on a textNode.

I was clearing out the currentScaleFactor when setting an attributedString into a textNode. It appears that `_calculateSize` isn't always called when setting a new string into a ASTextNode. It can be the case that only `drawInContext:bounds:` is called. With _currentScaleFactor cleared out the renderer that calls`drawInContext...` was being called with a scaleFactor of 0.

It could be the case that the fix could be to remove the clearing of `currentScaleFactor` from `setAttributedString`, but this seems like a safer fix to me. It does, however, require an extra run through the font adjuster when enabled.
2016-02-23 16:51:10 -08:00
rcancro
2adc30440f Exposing currentScaleFactor 2016-02-18 16:41:58 -08:00
rcancro
a920e353c6 adjust font size to make text fit within constrained size
# Conflicts:
#	AsyncDisplayKit/ASTextNode.mm
2016-02-16 16:16:22 -08:00
Luke Zhao
70be4c96ba import ASTextNode+Beta.h 2016-01-25 19:59:16 -08:00
Luke Zhao
f37c805b72 Move minimumScaleFactor to ASTextNode+Beta 2016-01-25 19:12:29 -08:00