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

feat: add CloseOnMaskToClose

Browse Source
This commit is contained in:
rabbitism
2024-02-02 00:41:09 +08:00
parent 1d01022a03
commit 7e488d29c2
4 changed files with 102 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ursa/Controls/Dialog/DialogControl.cs
View File

@@ -135,4 +135,16 @@ public class DialogControl: ContentControl
{
PseudoClasses.Set(PC_Modal, modal);
}
public void Close()
{
if (this.DataContext is IDialogContext context)
{
context.Close();
}
else
{
DialogControlClosing?.Invoke(this, DialogResult.None);
}
}
}

37
src/Ursa/Controls/Dialog/OverlayDialogHost.cs
View File

@@ -32,15 +32,34 @@ public class OverlayDialogHost : Canvas
set => SetValue(OverlayMaskBrushProperty, value);
}
private Border CreateOverlayMask() => new()
private Border CreateOverlayMask(bool canCloseOnClick)
{
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Stretch,
Width = this.Bounds.Width,
Height = this.Bounds.Height,
[!BackgroundProperty] = this[!OverlayMaskBrushProperty],
IsVisible = true,
};
Border border = new()
{
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Stretch,
Width = this.Bounds.Width,
Height = this.Bounds.Height,
[!BackgroundProperty] = this[!OverlayMaskBrushProperty],
IsVisible = true,
};
if (canCloseOnClick)
{
border.AddHandler(PointerReleasedEvent, ClickBorderToCloseDialog);
}
return border;
}
private void ClickBorderToCloseDialog(object sender, PointerReleasedEventArgs e)
{
if (sender is Border border)
{
int i = _masks.IndexOf(border);
DialogControl dialog = _modalDialogs[i];
dialog.Close();
border.RemoveHandler(PointerReleasedEvent, ClickBorderToCloseDialog);
}
}
protected sealed override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
@@ -138,7 +157,7 @@ public class OverlayDialogHost : Canvas
/// <param name="control"></param>
internal void AddModalDialog(DialogControl control)
{
var mask = CreateOverlayMask();
var mask = CreateOverlayMask(control.CanClickOnMaskToClose);
_masks.Add(mask);
_modalDialogs.Add(control);
control.SetAsModal(true);