From e85a7be881e42f7346827750f72b2d8c3fcafb77 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Thu, 3 May 2018 08:49:28 -0400 Subject: [PATCH] [spritekit] Fix SKActionTimingFunction delegate signature. Fixes #3944 (#4024) https://github.com/xamarin/xamarin-macios/issues/3944 --- src/SpriteKit/ObsoleteCompat.cs | 2 +- src/SpriteKit/SKAction.cs | 10 ++++++++++ src/spritekit.cs | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/SpriteKit/ObsoleteCompat.cs b/src/SpriteKit/ObsoleteCompat.cs index 8abd2afc8e..e8553139d3 100644 --- a/src/SpriteKit/ObsoleteCompat.cs +++ b/src/SpriteKit/ObsoleteCompat.cs @@ -21,7 +21,7 @@ namespace SpriteKit { return FalloffBy (to, duration); } - [Obsolete ("Use the 'TimingFunction' property.")] + [Obsolete ("Use the 'TimingFunction2' property.")] public virtual void SetTimingFunction (SKActionTimingFunction timingFunction) { TimingFunction = timingFunction; diff --git a/src/SpriteKit/SKAction.cs b/src/SpriteKit/SKAction.cs index 10ee8893b1..c62a046a7f 100644 --- a/src/SpriteKit/SKAction.cs +++ b/src/SpriteKit/SKAction.cs @@ -12,6 +12,12 @@ using CoreGraphics; using CoreFoundation; namespace SpriteKit { + +#if !XAMCORE_4_0 + [Obsolete ("Use 'SKActionTimingFunction2' instead.")] + public delegate void SKActionTimingFunction (float /* float, not CGFloat */ time); +#endif + #if XAMCORE_2_0 || !MONOMAC public partial class SKAction { @@ -32,6 +38,10 @@ namespace SpriteKit { { return Run (block, queue); } +#endif +#if !XAMCORE_4_0 + [Obsolete ("Use 'TimingFunction2' instead.")] + public virtual SKActionTimingFunction TimingFunction { get; set; } #endif } #endif diff --git a/src/spritekit.cs b/src/spritekit.cs index fe5be44285..2711e0b7d5 100644 --- a/src/spritekit.cs +++ b/src/spritekit.cs @@ -68,7 +68,7 @@ namespace SpriteKit { #endif delegate void SKNodeChildEnumeratorHandler (SKNode node, out bool stop); - delegate void SKActionTimingFunction (float /* float, not CGFloat */ time); + delegate float SKActionTimingFunction2 (float /* float, not CGFloat */ time); [Watch (3,0)] [iOS (8,0), Mac (10,10, onlyOn64 : true)] @@ -2324,7 +2324,7 @@ namespace SpriteKit { [iOS (8,0), Mac (10,10)] [NullAllowed, Export ("timingFunction", ArgumentSemantic.Assign)] - SKActionTimingFunction TimingFunction { get; set; } + SKActionTimingFunction2 TimingFunction2 { get; set; } [iOS (8,0), Mac(10,10)] [Static, Export ("falloffBy:duration:")]