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

[ASPrimitiveTraitCollection] Fix ASPrimitiveTraitCollectionMakeDefault and implement containerSize #1256

Merged
merged 1 commit into from
Nov 28, 2018
Merged

[ASPrimitiveTraitCollection] Fix ASPrimitiveTraitCollectionMakeDefault and implement containerSize #1256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion Source/Details/ASTraitCollection.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ void ASTraitCollectionPropagateDown(id<ASLayoutElement> element, ASPrimitiveTrai
}

ASPrimitiveTraitCollection ASPrimitiveTraitCollectionMakeDefault() {
ASPrimitiveTraitCollection tc;
ASPrimitiveTraitCollection tc = {};
tc.userInterfaceIdiom = UIUserInterfaceIdiomUnspecified;
tc.forceTouchCapability = UIForceTouchCapabilityUnknown;
tc.displayScale = 0.0;
tc.horizontalSizeClass = UIUserInterfaceSizeClassUnspecified;
tc.verticalSizeClass = UIUserInterfaceSizeClassUnspecified;
tc.containerSize = CGSizeZero;
Expand Down Expand Up @@ -213,6 +216,10 @@ - (UITraitEnvironmentLayoutDirection)layoutDirection
{
return _prim.layoutDirection;
}
- (CGSize)containerSize
{
return _prim.containerSize;
}
#if AS_BUILD_UIUSERINTERFACESTYLE
- (UIUserInterfaceStyle)userInterfaceStyle
{
Expand Down