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

Use standard ivar _ prefix for userInterfaceStyle in ASImageNodeDrawParameters #1660

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Use standard ivar _ prefix for userInterfaceStyle in ASImageNodeDrawParameters #1660

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
6 changes: 3 additions & 3 deletions Source/ASImageNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ @interface ASImageNodeDrawParameters : NSObject {
ASDisplayNodeContextModifier _willDisplayNodeContentWithRenderingContext;
ASDisplayNodeContextModifier _didDisplayNodeContentWithRenderingContext;
ASImageNodeDrawParametersBlock _didDrawBlock;
UIUserInterfaceStyle userInterfaceStyle API_AVAILABLE(tvos(10.0), ios(12.0));
UIUserInterfaceStyle _userInterfaceStyle API_AVAILABLE(tvos(10.0), ios(12.0));
}

@end
Expand Down Expand Up @@ -317,7 +317,7 @@ - (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
drawParameters->_willDisplayNodeContentWithRenderingContext = _willDisplayNodeContentWithRenderingContext;
drawParameters->_didDisplayNodeContentWithRenderingContext = _didDisplayNodeContentWithRenderingContext;
if (AS_AVAILABLE_IOS_TVOS(12, 10)) {
drawParameters->userInterfaceStyle = self.primitiveTraitCollection.userInterfaceStyle;
drawParameters->_userInterfaceStyle = self.primitiveTraitCollection.userInterfaceStyle;
}


Expand Down Expand Up @@ -423,7 +423,7 @@ + (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESC
contentsKey.imageModificationBlock = imageModificationBlock;

if (AS_AVAILABLE_IOS_TVOS(12, 10)) {
UIUserInterfaceStyle userInterfaceStyle = drawParameter->userInterfaceStyle;
UIUserInterfaceStyle userInterfaceStyle = drawParameter->_userInterfaceStyle;
contentsKey.userInterfaceStyle = userInterfaceStyle;
}

Expand Down