chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add option to disable animation.

Browse Source
This commit is contained in:
rabbitism
2024-03-27 21:54:44 +08:00
parent 4c1befb7dd
commit 77f4a5e051
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
View File

@@ -126,7 +126,10 @@ public partial class OverlayDialogHost
{ {
_modalCount--; _modalCount--;
HasModal = _modalCount > 0; HasModal = _modalCount > 0;
await _maskDisappearAnimation.RunAsync(layer.Mask); if (!IsAnimationDisabled)
{
await _maskDisappearAnimation.RunAsync(layer.Mask);
}
} }
} }
@@ -156,7 +159,10 @@ public partial class OverlayDialogHost
SetToPosition(control); SetToPosition(control);
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing); control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged); control.AddHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
_maskAppearAnimation.RunAsync(mask); if (!IsAnimationDisabled)
{
_maskAppearAnimation.RunAsync(mask);
}
_modalCount++; _modalCount++;
HasModal = _modalCount > 0; HasModal = _modalCount > 0;
control.IsClosed = false; control.IsClosed = false;

37
src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
View File

@@ -28,13 +28,20 @@ public partial class OverlayDialogHost
SetDrawerPosition(control); SetDrawerPosition(control);
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDrawerControlClosing); control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDrawerControlClosing);
var animation = CreateAnimation(control.Bounds.Size, control.Position, true); var animation = CreateAnimation(control.Bounds.Size, control.Position, true);
if (mask is null) if (IsAnimationDisabled)
{ {
await animation.RunAsync(control); ResetDrawerPosition(control, this.Bounds.Size);
} }
else else
{ {
await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask)); if (mask is null)
{
await animation.RunAsync(control);
}
else
{
await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask));
}
} }
} }
@@ -52,7 +59,14 @@ public partial class OverlayDialogHost
HasModal = _modalCount > 0; HasModal = _modalCount > 0;
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDrawerControlClosing); control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDrawerControlClosing);
var animation = CreateAnimation(control.Bounds.Size, control.Position); var animation = CreateAnimation(control.Bounds.Size, control.Position);
await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask)); if (IsAnimationDisabled)
{
ResetDrawerPosition(control, this.Bounds.Size);
}
else
{
await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask));
}
} }
private void SetDrawerPosition(DrawerControlBase control) private void SetDrawerPosition(DrawerControlBase control)
@@ -150,15 +164,20 @@ public partial class OverlayDialogHost
_modalCount--; _modalCount--;
HasModal = _modalCount > 0; HasModal = _modalCount > 0;
layer.Mask.RemoveHandler(PointerPressedEvent, ClickMaskToCloseDialog); layer.Mask.RemoveHandler(PointerPressedEvent, ClickMaskToCloseDialog);
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false); if (!IsAnimationDisabled)
await Task.WhenAll(disappearAnimation.RunAsync(control), _maskDisappearAnimation.RunAsync(layer.Mask)); {
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false);
await Task.WhenAll(disappearAnimation.RunAsync(control), _maskDisappearAnimation.RunAsync(layer.Mask));
}
Children.Remove(layer.Mask); Children.Remove(layer.Mask);
} }
else else
{ {
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false); if (!IsAnimationDisabled)
await disappearAnimation.RunAsync(control); {
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false);
await disappearAnimation.RunAsync(control);
}
} }
Children.Remove(control); Children.Remove(control);
ResetZIndices(); ResetZIndices();

4
src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
View File

@@ -15,7 +15,7 @@ public partial class OverlayDialogHost: Canvas
private static readonly Animation _maskAppearAnimation; private static readonly Animation _maskAppearAnimation;
private static readonly Animation _maskDisappearAnimation; private static readonly Animation _maskDisappearAnimation;
private readonly List<DialogPair> _layers = new List<DialogPair>(); private readonly List<DialogPair> _layers = new List<DialogPair>(10);
private class DialogPair private class DialogPair
{ {
@@ -44,6 +44,8 @@ public partial class OverlayDialogHost: Canvas
private set => SetAndRaise(HasModalProperty, ref _hasModal, value); private set => SetAndRaise(HasModalProperty, ref _hasModal, value);
} }
public bool IsAnimationDisabled { get; set; }
static OverlayDialogHost() static OverlayDialogHost()
{ {
ClipToBoundsProperty.OverrideDefaultValue<OverlayDialogHost>(true); ClipToBoundsProperty.OverrideDefaultValue<OverlayDialogHost>(true);