ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-08 21:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,065 Commits 3 Branches 281 Tags
Commit Graph

30 Commits

Author SHA1 Message Date
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
00b0968bf7 Add ability to customize NSLayoutManager and NSTextStorage when created in the ASTextKitContext 2016-02-22 13:00:02 -08:00
rcancro
0e7fae1825 reverted some debug code 2016-02-16 16:16:29 -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
Tom King
d0edbe809a ensure that the truncater is initialized before the context is in _calculateSize 2016-01-29 09:32:40 -05:00
appleguy
2c194fd924 Merge pull request #1140 from rcancro/textNodeWordSpacing 
[ASTextNode] Added ASTextNodeWordKerner support
 2016-01-28 15:38:00 -08:00
rcancro
7f6f2fed11 Added ASTextNodeWordKerner support to ASTextNode 
* Added a member to `ASTextKitAttributes` that is an optional delegate to the struct's NSLayoutManager.
* Changed ASTextNode to set this delegate to an instance of ASTextNodeWordKerner.
* Updated init method of `ASTextKitContext` to take an optional NSLayoutManager delegate
* Added the files in TextKit folder to the public headers (so we can include ASTextNodeTypes.h)
 2016-01-28 08:38:22 -08:00
appleguy
5b9be8a8c3 Merge pull request #1127 from samhsiung/foreground_color_link 
[ASTextKit] Use NSForegroundColorAttributeName for links in ASTextKitRenderer
 2016-01-27 22:42:04 -08:00
Samuel Hsiung
90ac40020f Use NSForegroundColorAttributeName for links in ASTextNodes by subclassing NSLayoutManager 2016-01-27 21:13:28 -08:00
Luke Zhao
733c65d1eb fix bug: constraint size not updated for frontsizeadjuster 2016-01-27 13:49:00 -08:00
yury
a3a0440a01 [text] Use the closest glyph to determine hit token 2016-01-26 22:41:02 +03:00
yury
a0b7254213 [text] Fix crash when highlighted range exceeds truncation range 2016-01-26 22:37:44 +03:00
appleguy
508e3db8ee Merge pull request #1091 from lkzhao/ASTextKitFontSizeAdjuster 
[ASTextNode] Support iteratively shrinking font size in order to ensure no single words are wrapped.
 2016-01-25 19:36:39 -08:00
Luke Zhao
f413a618e0 add ASTextKitFontSizeAdjuster 2016-01-25 19:07:28 -08:00
yury
313a3cc63c Create Truncater with context. So it will actually truncate string in its initializer 2016-01-25 16:48:55 +03:00
Scott Goodson
9ddf68fa96 [ASTextNode] Optimize handling of constrained size to almost never recreate NSLayoutManager 
This also fixes two fairly subtle but serious bugs, #1076 and #1046.
 2016-01-24 00:50:43 -08:00
Aaron Schubert
10a2984d8c Potential fix for #1076 2016-01-19 12:25:30 +00:00
Scott Goodson
882d4b336e Merge branch 'master' into pr/664 2015-12-25 14:32:41 -08:00
Scott Goodson
99fbc97bda Optimizations for ASTextNode handling of renderer allocation and deallocation. 
Optimizations for ASDisplayNode handling of bridged property "contentMode", especially for layer-backed nodes.
 2015-12-25 01:36:32 -08:00
Adlai Holler
69767d558e Merge branch 'master' into update-objc 
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
 2015-12-22 00:28:21 -05:00
appleguy
3b5fb17f81 Merge pull request #942 from bsmith11/ASTextKitCoreTextAttributesBug 
ASTextKit CoreText attributes cleansing should not remove NSParagraphStyle attributes
 2015-12-17 19:18:43 -08:00
Bradley Smith
e64965c1ca Fixed ASTextKit CoreText attributes bug which was incorrectly reading a NSParagraphStyle as CTParagraphStyleRef 2015-12-15 14:41:37 -05:00
Samuel Hsiung
f9d476e170 Fix ASTextNode truncated size calculation ignoring attributes in the last line 2015-12-15 10:09:03 -08:00
Adlai Holler
fdfe18873a Merge branch 'master' into update-objc 
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
 2015-12-01 16:45:25 -08:00
Levi McCallum
04ad021daa Rename positioning block to sport as namespace 2015-11-30 06:55:32 -08:00
Levi McCallum
cd78bcce99 Convert naming of hash helpers to AS namespace 2015-11-30 06:53:50 -08:00
Levi McCallum
a0c05ebffc Rename CK classes to AS classes 2015-11-30 06:44:53 -08:00
Levi McCallum
74435fb584 Convert ASTextNode to support CKTextKitRenderer 2015-11-30 06:41:41 -08:00
Levi McCallum
bae3e3b63d Add latest ComponentKit text kit renderer into project 2015-11-30 06:41:40 -08:00