Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ASTextNode] Implement an example comparing ASTextNode 1 & 2 behavior. #570

Merged
merged 22 commits into from
Oct 17, 2017
Merged

[ASTextNode] Implement an example comparing ASTextNode 1 & 2 behavior. #570

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 Jul 16, 2017
dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 Sep 6, 2017
16eed36
add constraint to using catching for layout
wsdwsd0829 Sep 6, 2017
c701a04
Add TextNode example to test Yoga Layout
wsdwsd0829 Sep 14, 2017
14e55fc
update Yoga version
wsdwsd0829 Sep 14, 2017
38de2a4
add debugging log
wsdwsd0829 Sep 15, 2017
6da11f9
fix lisence
wsdwsd0829 Sep 15, 2017
084917e
clean up
wsdwsd0829 Sep 15, 2017
64c69fb
clean up
wsdwsd0829 Sep 15, 2017
dd61928
fix lisence warning
wsdwsd0829 Sep 15, 2017
2273696
add shared scheme
wsdwsd0829 Sep 15, 2017
e922dbe
change sdk version
wsdwsd0829 Sep 15, 2017
a5005f5
revert some metadata
wsdwsd0829 Oct 4, 2017
b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 Oct 4, 2017
a073da7
Merge branch 'master' into flex-layout-examples
wsdwsd0829 Oct 4, 2017
a5eaa5a
Merge FlexLayoutExample to TextStressText.
wsdwsd0829 Oct 5, 2017
8c6caee
clean up
wsdwsd0829 Oct 5, 2017
b6622f2
fix lisence and syntax
wsdwsd0829 Oct 16, 2017
fd497d6
clean up
wsdwsd0829 Oct 16, 2017
55074c5
remove xcworkspacedata
wsdwsd0829 Oct 16, 2017
720bdd1
Tiny coding style changes
nguyenhuy Oct 17, 2017
f257d5b
Another tiny change related to code style
nguyenhuy Oct 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/ASTextNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
// Add the constrained size back textContainerInset
size.width += (_textContainerInset.left + _textContainerInset.right);
size.height += (_textContainerInset.top + _textContainerInset.bottom);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wsdwsd0829 you can delete these whitespace changes, and also revert the diffs to Kittens / CatDealsCollectionView / ASDKgram.

Will catch up with you offline to talk about potentially putting the new view controller in examples_extra/TextStressTest; this would reduce some of the other boilerplate and might help us centralize our reproduction cases for text drawing issues.


return CGSizeMake(std::fmin(size.width, originalConstrainedSize.width),
std::fmin(size.height, originalConstrainedSize.height));
}
Expand Down
6 changes: 3 additions & 3 deletions Source/ASTextNode2.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
NSMutableAttributedString *mutableText = [attributedText mutableCopy];
[self prepareAttributedStringForDrawing:mutableText];
ASTextLayout *layout = [ASTextNode2 compatibleLayoutWithContainer:container text:mutableText];

[self setNeedsDisplay];

return layout.textBoundingSize;
}

Expand Down Expand Up @@ -415,7 +415,7 @@ + (ASTextLayout *)compatibleLayoutWithContainer:(ASTextContainer *)container
if (!CGRectContainsRect(maxRect, containerBounds)) {
continue;
}

// Now check container params.
ASTextContainer *otherContainer = layout.container;
if (!UIEdgeInsetsEqualToEdgeInsets(container.insets, otherContainer.insets)) {
Expand Down
20 changes: 20 additions & 0 deletions examples/ASDKgram/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down Expand Up @@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
Expand Down
10 changes: 10 additions & 0 deletions examples/CatDealsCollectionView/Sample.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions examples/FlexLayoutExamples/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
target 'Sample' do
#pod 'Texture', :path => '../..'
pod 'Texture/Yoga', :path => '../..'
end
Loading