ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-21 03:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,012 Commits 3 Branches 309 Tags
e8d94de9ce4bb10fca1ccbf17f562f361e2bea35
Commit Graph

25012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
appleguy
5fde235d87 Merge pull request #1356 from rcancro/textShrinkningOptimizations 
[ASTextNode] More refinements to the new font size adjuster behavior.
 2016-03-09 16:48:29 -08:00
appleguy
0bc60605e5 Merge pull request #1348 from eanagel/fix-collection-hang 
[ASCollectionView] Ensure that we use the correct default size for collection nodes when constrainedSize delegate method not implemented.
 2016-03-09 16:41:51 -08:00
rcancro
bcb1832fcd Fixed some text shrinking issues 
Previously I was multiplying the calculated height of the text by the scale factor. This fails in the case where we have a long string that doesn't fit, but it is shrunk so much that it now has more than enough room in the renderer's constrained size. In this case we fail to update the calculated size's width.

Also updated `lineCountForString` in `ASTextKitFontSizeAdjuster` to reuse a sizer layout manager and text container.
 2016-03-09 15:27:33 -08:00
Michael Schneider
13207dc2da Change memory notification method name 2016-03-09 14:53:37 -08:00
Michael Schneider
bf822dee37 Add ASLayoutRangeModeLowMemory 2016-03-09 14:40:40 -08:00
Peter
f9620a013c no message 2016-03-10 00:08:04 +03:00
Lukas Spieß
113a9b6193 Merge branch 'preseason' into feature/metrics/develop 2016-03-09 21:19:21 +01:00
Lukas Spieß
8751dd8cb2 Merge branch 'release/4.0.0-alpha.2' into preseason 2016-03-09 21:17:24 +01:00
Lukas Spieß
176b36aa3d Update changelog 2016-03-09 21:14:54 +01:00
Lukas Spieß
16af96aeaa Update build and version numbers 2016-03-09 21:14:45 +01:00
Lukas Spieß
1f5158e12e Increase build number 2016-03-09 21:07:19 +01:00
Lukas Spieß
0e8c7c74ce Merge branch 'develop' into feature/metrics/develop 
# Conflicts:
#	README.md
#	Support/buildnumber.xcconfig
#	docs/Changelog-template.md
#	docs/Guide-Installation-Setup-template.md
 2016-03-09 21:06:42 +01:00
Lukas Spieß
27be381001 Increase build number 2016-03-09 21:03:08 +01:00
Eric Jensen
9d4c53b0fa Replace usage of deprecated NSControlCharacterAction value 2016-03-09 11:44:13 -08:00
Lukas Spieß
846ace6e8a Fix syntax error in podspec 2016-03-09 20:31:14 +01:00
Lukas Spieß
dd48e82c8a Remove wrong feature compiler macro 2016-03-09 20:29:26 +01:00
Levi McCallum
52391dcc27 Change method name in implementation 2016-03-09 10:42:56 -08:00
Levi McCallum
a07f7b73f0 Change method name in header 2016-03-09 10:42:35 -08:00
Levi McCallum
d4a0c34d86 Add ASSizeRangeMakeWithExactCGSize method 2016-03-09 10:39:46 -08:00
Levi McCallum
167b7d404e Add header for extern ASSizeRangeMakeWithExactCGSize 2016-03-09 10:38:25 -08:00
Ethan Nagel
352247184a Ensure that we use the correct default size for collection nodes even if layoutSubviews has not been called yet. This is a more conservative approach than the previous one. 2016-03-09 09:56:32 -08:00
Tom King
a22278340f fixed indentation 2016-03-09 10:27:38 -05:00
Aaron Schubert
71eb9582fb [ASTextNode] Fix default ellipsis not showing for line breaks 2016-03-09 15:10:26 +00:00
Tom King
cd85389397 support the combined [.Selected, .Highlighted] state in ASButtonNode 2016-03-09 09:23:15 -05:00
appleguy
de4e4db671 Merge pull request #1340 from ejensen/documentation-corrections 
[Documentation] Various header documentation corrections and refinements.
 2016-03-09 02:52:48 -08:00
appleguy
1ce3834e0e Merge pull request #1343 from rcancro/cacheFontScale 
[ASTextNode] Improvements to the implementation of the font scale adjuster.
 2016-03-09 02:41:13 -08:00
appleguy
112489927e Merge pull request #1338 from tomizimobile/truncationTokenFix 
[ASTextNode] Fix tapping on truncation token for 3D Touch phones
 2016-03-09 02:16:45 -08:00
appleguy
9759ed0848 Merge pull request #1336 from hannahmbanana/ASImageNodeScaleFactorLabel 
[ASImageNode] An ASImageNode debug feature showing pixel scaling amount
 2016-03-09 02:11:57 -08:00
Hannah Troisi
3f4b4b9f3c [ASImageNode] More refined naming and documentation for [ASImageNode shouldShowImageScalingOverlay] 2016-03-09 00:43:10 -08:00
Hannah Troisi
51eccb3d96 [ASImageNode] More refined naming and documentation for [ASImageNode shouldShowImageScalingOverlay] 2016-03-08 23:30:17 -08:00
Hannah Troisi
3fe44b4e23 Merge branch 'ASImageNodeScaleFactorLabel' of https://github.com/hannahmbanana/AsyncDisplayKit into ASImageNodeScaleFactorLabel 2016-03-08 23:16:11 -08:00
Hannah Troisi
fbe72a06e4 [ASImageNode] A ASImageNode debug feature showing pixel scaling amount 
- shows a red text label overlay on bottom right hand corner of ASImageNodes with pixel scaling factor
- import AsyncDisplayKit+Debug.h and enable using [ASImageNode setEnableImageDebugOverlay]
 2016-03-08 23:15:07 -08:00
Hannah Troisi
d64c05a68e [ASImageNode] A ASImageNode debug feature showing pixel scaling amount 
- shows a red text label overlay on bottom right hand corner of ASImageNodes with pixel scaling factor
- import AsyncDisplayKit+Debug.h and enable using [ASImageNode setEnableImageDebugOverlay]
 2016-03-08 23:13:32 -08:00
Hannah Troisi
91b81d0e80 Merge remote-tracking branch 'facebook/master' 2016-03-08 23:12:42 -08:00
Scott Goodson
8703920d55 [Xcode Project] Add new file to the framework target. Update to recommended build settings to resolve 1 of 1 warnings. 2016-03-08 22:58:27 -08:00
Scott Goodson
06ea9461cb [ASScrollDirection] Fix tests to use the more intuitive naming for scroll directions. 2016-03-08 22:48:02 -08:00
appleguy
8cbb5d86dc Merge pull request #1344 from eanagel/fix-collection-hang 
[ASCollectionView] Ensure that we use the correct default size for collection nodes even if layoutSubviews has not been called yet
 2016-03-08 18:10:05 -08:00
Ethan Nagel
5a3dab5610 Ensure that er use the correct default size for collection nodes even if layoutSubviews has not been called yet 2016-03-08 17:03:55 -08:00
rcancro
06a6bd6606 fix typo and kick off build again. 2016-03-08 16:32:24 -08:00
Peter
3cc232e378 no message 2016-03-09 01:27:33 +03:00
Peter
fea836c8f3 no message 2016-03-09 01:07:49 +03:00
rcancro
3ebdf5928c Made a few changes to font scale adjustment 
1) cache the scale in the font adjuster. The adjuster will be dealloc'ed when the renderer that owns it is dealloc'ed (or invalidated). Until that time we can trust the scale that the adjuster has computed.
2) When measuring line count, make sure that we are not bounding the height of the container's size. This will cause the wrong number of lines to be returned.
3) Instead of setting the ascender/descender on an ASTextNode when an attributed string is added, wait until after the renderer calculates size. This way, if there is any need to scale the font to fit we can apply that scale to the ascender/descender.
 2016-03-08 12:05:26 -08:00
Eric Jensen
c2f85397ce Mark depreciated protocols with deprivation attribute 2016-03-08 11:56:58 -08:00
Eric Jensen
84357c4a48 Correct a couple more documentation comments 2016-03-08 11:56:58 -08:00
Eric Jensen
3d34c177ed Flatten indentation of parameter hierarchy 2016-03-08 11:56:58 -08:00
Eric Jensen
86ccd33a84 Correct a few documentation comments for method parameters 2016-03-08 11:56:58 -08:00
Lukas Spieß
e9e64003c3 Merge tag '3.8.6' into develop 2016-03-08 20:52:41 +01:00
Lukas Spieß
54a09a2814 Merge branch 'release/3.8.6' 2016-03-08 20:52:40 +01:00
Christoph Wendt
2f26dc79c4 Update podspecs 2016-03-08 18:44:29 +01:00
Christoph Wendt
f25b7b5eb4 Remove duplicate entry in changelog 2016-03-08 18:44:29 +01:00