Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 58b4f04

Browse files
AndreiMisiukevichjsuarezruizjfversluis
authored
Fixes #974 (#975)
Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: Gerald Versluis <[email protected]>
1 parent d47128e commit 58b4f04

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/Touch/GestureManager.shared.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ Task SetBackgroundColor(TouchEffect sender, TouchState touchState, HoverState ho
360360

361361
if (duration <= 0)
362362
{
363+
element.AbortAnimations();
363364
element.BackgroundColor = color;
364365
return Task.FromResult(true);
365366
}
@@ -388,6 +389,7 @@ Task SetOpacity(TouchEffect sender, TouchState touchState, HoverState hoverState
388389
var element = sender.Element;
389390
if (duration <= 0)
390391
{
392+
element.AbortAnimations();
391393
element.Opacity = opacity;
392394
return Task.FromResult(true);
393395
}
@@ -416,12 +418,13 @@ Task SetScale(TouchEffect sender, TouchState touchState, HoverState hoverState,
416418
var element = sender.Element;
417419
if (duration <= 0)
418420
{
421+
element.AbortAnimations(nameof(SetScale));
419422
element.Scale = scale;
420423
return Task.FromResult(true);
421424
}
422425

423426
var animationCompletionSource = new TaskCompletionSource<bool>();
424-
element.Animate($"{nameof(SetScale)}{element.Id}", v =>
427+
element.Animate(nameof(SetScale), v =>
425428
{
426429
if (double.IsNaN(v))
427430
return;
@@ -469,6 +472,7 @@ Task SetTranslation(TouchEffect sender, TouchState touchState, HoverState hoverS
469472
var element = sender.Element;
470473
if (duration <= 0)
471474
{
475+
element.AbortAnimations();
472476
element.TranslationX = translationX;
473477
element.TranslationY = translationY;
474478
return Task.FromResult(true);
@@ -498,6 +502,7 @@ Task SetRotation(TouchEffect sender, TouchState touchState, HoverState hoverStat
498502
var element = sender.Element;
499503
if (duration <= 0)
500504
{
505+
element.AbortAnimations();
501506
element.Rotation = rotation;
502507
return Task.FromResult(true);
503508
}
@@ -526,6 +531,7 @@ Task SetRotationX(TouchEffect sender, TouchState touchState, HoverState hoverSta
526531
var element = sender.Element;
527532
if (duration <= 0)
528533
{
534+
element.AbortAnimations();
529535
element.RotationX = rotationX;
530536
return Task.FromResult(true);
531537
}
@@ -554,6 +560,7 @@ Task SetRotationY(TouchEffect sender, TouchState touchState, HoverState hoverSta
554560
var element = sender.Element;
555561
if (duration <= 0)
556562
{
563+
element.AbortAnimations();
557564
element.RotationY = rotationY;
558565
return Task.FromResult(true);
559566
}

0 commit comments

Comments
 (0)