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

[Metal/SpriteKit] Fix availability attributes on a few API. #5033

Merged
merged 1 commit into from
Oct 24, 2018
Merged

[Metal/SpriteKit] Fix availability attributes on a few API. #5033

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/metal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,8 @@ partial interface MTLRenderCommandEncoder : MTLCommandEncoder {
[Abstract, Export ("setCullMode:")]
void SetCullMode (MTLCullMode cullMode);

[Mac (10,11, onlyOn64 : true), TV (11,0), iOS (11,0), NoWatch]
[iOS (9,0)] // Current headers claim this member was introduced in iOS 11, but it also shows up in Xcode 7's header (as introduced in iOS 9)
[Mac (10,11, onlyOn64 : true), TV (11,0), NoWatch]
#if XAMCORE_4_0
// Apple added a new required member in iOS 9, but that breaks our binary compat, so we can't do that in our existing code.
[Abstract]
Expand Down
6 changes: 4 additions & 2 deletions src/spritekit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,12 @@ partial interface SKNode : NSSecureCoding, NSCopying {
[return: NullAllowed]
SKNode Create (string filename, IntPtr classesPtr, out NSError error);

#if MONOMAC || WATCH
[Export ("frame")]
CGRect Frame { get; }
#if !(MONOMAC || WATCH)
// For iOS+tvOS we also get this property from the UIFocusItem protocol, but we redefine it here to get the right availability attributes.
new
#endif
CGRect Frame { get; }

[Export ("calculateAccumulatedFrame")]
CGRect CalculateAccumulatedFrame ();
Expand Down