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

feat: add a property to show if there is modal dialog available in a host.

Browse Source
This commit is contained in:
rabbitism
2024-02-08 23:44:02 +08:00
parent 974afa33c5
commit 9a34ce2620
3 changed files with 108 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ public partial class OverlayDialogHost
Children.Add(mask);
}
this.Children.Add(control);
_layers.Add(new DialogPair(mask, control));
_layers.Add(new DialogPair(mask, control, false));
control.Measure(this.Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
SetToPosition(control);
@@ -118,6 +118,11 @@ public partial class OverlayDialogHost
{
await _maskDisappearAnimation.RunAsync(layer.Mask);
Children.Remove(layer.Mask);
if (layer.Modal)
{
_modalCount--;
HasModal = _modalCount > 0;
}
}
ResetZIndices();
@@ -142,6 +147,8 @@ public partial class OverlayDialogHost
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
_maskAppearAnimation.RunAsync(mask);
_modalCount++;
HasModal = _modalCount > 0;
control.IsClosed = false;
}

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

@@ -24,13 +24,28 @@ public partial class OverlayDialogHost: Canvas
{
internal PureRectangle? Mask;
internal OverlayFeedbackElement Element;
internal bool Modal;
public DialogPair(PureRectangle? mask, OverlayFeedbackElement element)
public DialogPair(PureRectangle? mask, OverlayFeedbackElement element, bool modal = true)
{
Mask = mask;
Element = element;
Modal = modal;
}
}
private int _modalCount = 0;
public static readonly DirectProperty<OverlayDialogHost, bool> HasModalProperty = AvaloniaProperty.RegisterDirect<OverlayDialogHost, bool>(
nameof(HasModal), o => o.HasModal);
private bool _hasModal;
public bool HasModal
{
get => _hasModal;
private set => SetAndRaise(HasModalProperty, ref _hasModal, value);
}
static OverlayDialogHost()
{