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.

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

[coreanimation] Update to beta 4 #2382

Merged
merged 1 commit into from
Jul 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions src/CoreAnimation/CAEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
using XamCore.Foundation;
using System.Runtime.InteropServices;
using XamCore.CoreGraphics;
using XamCore.ObjCRuntime;

namespace XamCore.CoreAnimation {

Expand All @@ -47,6 +48,16 @@ public enum CAEdgeAntialiasingMask : uint_compat_int {
TopBottomEdges = TopEdge | BottomEdge
}

[NoWatch] // headers not updated
[iOS (11,0)][TV (11,0)][Mac (10,13)]
[Native][Flags]
public enum CACornerMask : nuint {
MinXMinYCorner = 1 << 0,
MaxXMinYCorner = 1 << 1,
MinXMaxYCorner = 1 << 2,
MaxXMaxYCorner = 1 << 3,
}

#if MONOMAC
// untyped enum -> CALayer.h (only on OSX headers)
// note: autoresizingMask is an `unsigned int` @property
Expand Down
15 changes: 15 additions & 0 deletions src/coreanimation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,11 @@ interface CALayer : CAMediaTiming, NSSecureCoding {
[NullAllowed] // by default this property is null
[Export ("compositingFilter", ArgumentSemantic.Strong)]
NSObject CompositingFilter { get; set; }

[NoWatch] // headers not updated
[TV (11,0)][Mac (10,13)][iOS (11,0)]
[Export ("maskedCorners", ArgumentSemantic.Assign)]
CACornerMask MaskedCorners { get; set; }
}

#if XAMCORE_2_0 || !MONOMAC
Expand Down Expand Up @@ -626,6 +631,16 @@ interface CAMetalLayer {

[Export ("presentsWithTransaction")]
bool PresentsWithTransaction { [Bind ("presentsWithTransaction")] get; set; }

[NoWatch][NoTV][NoiOS]
[Mac (10,13)]
[Export ("displaySyncEnabled")]
bool DisplaySyncEnabled { get; set; }

[NoWatch] // headers not updated
[TV (11,0)][Mac (10,13)][iOS (11,0)]
[Export ("allowsNextDrawableTimeout")]
bool AllowsNextDrawableTimeout { get; set; }
}
#endif

Expand Down