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

[ASTraitCollection] Add missing properties to ASTraitCollection #625

Merged
merged 7 commits into from
Jan 16, 2018
Merged

[ASTraitCollection] Add missing properties to ASTraitCollection #625

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70fbac1
[ASTraitCollection] Add missing properties to ASTraitCollection
ypogribnyi Oct 20, 2017
5afe689
Merge branch 'master' into ASTraitCollection-missing-properties
ypogribnyi Nov 1, 2017
e0c395e
* Remove enum ASContentSizeCategory.
ypogribnyi Nov 1, 2017
185a139
Added ASPrimitiveTraitCollection lifetime test
ypogribnyi Nov 1, 2017
10f3d8f
Merge branch 'master' of https://github.com/TextureGroup/Texture into…
ypogribnyi Jan 16, 2018
663d272
Changes requested at code review:
ypogribnyi Jan 16, 2018
11dc888
Fix failing test
ypogribnyi Jan 16, 2018
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
Prev Previous commit
Fix failing test
  • Loading branch information
@ypogribnyi
ypogribnyi committed Jan 16, 2018
commit 11dc888bb172f71279f26832fa5e854389d57d42
2 changes: 1 addition & 1 deletion Tests/ASCollectionViewTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ - (void)testTraitCollectionChangesMidUpdate
[window layoutIfNeeded];

// The initial reload is async, changing the trait collection here should be "mid-update"
ASPrimitiveTraitCollection traitCollection;
ASPrimitiveTraitCollection traitCollection = ASPrimitiveTraitCollectionMakeDefault();
traitCollection.displayScale = cn.primitiveTraitCollection.displayScale + 1; // Just a dummy change
traitCollection.containerSize = screenBounds.size;
cn.primitiveTraitCollection = traitCollection;
Expand Down