Skip to content

Commit 89e70c1

Browse files
committed
fix(catalyst): Move to newer Preview 14 API breaking changes
1 parent 00144d4 commit 89e70c1

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

src/Uno.UI.Composition/Composition/CoreAnimation.iOSmacOS.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,13 @@ private void StartAnimation(float from, float to, float delayMilliseconds, float
155155
var discreteAnim = CAKeyFrameAnimation.FromKeyPath(_property);
156156
discreteAnim.KeyTimes = new NSNumber[] {new NSNumber(0.0), new NSNumber(1.0)};
157157
discreteAnim.Values = new NSObject[] {_nsValueConversion(to)};
158-
discreteAnim.CalculationMode = CAKeyFrameAnimation.AnimationDescrete;
158+
159+
discreteAnim.CalculationMode
160+
#if NET6_0_OR_GREATER
161+
= CAKeyFrameAnimation.AnimationDiscrete;
162+
#else
163+
= CAKeyFrameAnimation.AnimationDescrete;
164+
#endif
159165

160166
animation = discreteAnim;
161167
}

src/Uno.UI/UI/Xaml/Media/Animation/Animators/DisplayLinkValueAnimator.iOSmacOS.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,15 @@ private void ReleaseDisplayLink()
194194
{
195195
if (_isAttachedToLooper)
196196
{
197-
#if __IOS__
198197
//Detach the _displayLink to the MainLoop (uiThread).
198+
#if __IOS__
199+
#if NET6_0_OR_GREATER
200+
_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.Default);//detaches from the UI thread
201+
_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.UITracking);
202+
#else
199203
_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.NSDefaultRunLoopMode);//detaches from the UI thread
200204
_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.UITrackingRunLoopMode);
205+
#endif
201206
_displayLink = null;
202207
#endif
203208
_isAttachedToLooper = false;

src/Uno.UI/UI/Xaml/Media/CompositionTarget.iOS.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,13 @@ public static event EventHandler<object> Rendering
3232

3333
if(_handlers.Count == 0)
3434
{
35+
#if NET6_0_OR_GREATER
36+
_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.Default);
37+
_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.UITracking);
38+
#else
3539
_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.NSDefaultRunLoopMode);
3640
_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.UITrackingRunLoopMode);
41+
#endif
3742
_displayLink = null;
3843
}
3944
}

0 commit comments

Comments
 (0)