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

Merge pull request #304 from irihitech/dialog

Browse Source 
Fix Modal status issue and un-register issue
This commit is contained in:
Dong Bin
2024-07-24 14:50:48 +08:00
committed by GitHub
parent b0d3806d52 c4f0c1143b
commit a92e68269f
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
View File

@@ -64,7 +64,7 @@
Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}" Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"
LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}" LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}"
RightContent="{Binding $parent[u:UrsaWindow].RightContent}" /> RightContent="{Binding $parent[u:UrsaWindow].RightContent}" />
<u:OverlayDialogHost /> <u:OverlayDialogHost IsModalStatusReporter="True" />
</VisualLayerManager.ChromeOverlayLayer> </VisualLayerManager.ChromeOverlayLayer>
<Panel> <Panel>
<ContentPresenter <ContentPresenter

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

@@ -35,16 +35,6 @@ public partial class OverlayDialogHost: Canvas
private int _modalCount = 0; private int _modalCount = 0;
public static readonly DirectProperty<OverlayDialogHost, bool> HasModalProperty = AvaloniaProperty.RegisterDirect<OverlayDialogHost, bool>(
nameof(HasModal), o => o.HasModal);
private bool _hasModal;
[Obsolete("Use IsInModalStatus")]
public bool HasModal
{
get => _hasModal;
private set => SetAndRaise(HasModalProperty, ref _hasModal, value);
}
public static readonly AttachedProperty<bool> IsModalStatusScopeProperty = public static readonly AttachedProperty<bool> IsModalStatusScopeProperty =
AvaloniaProperty.RegisterAttached<OverlayDialogHost, Control, bool>("IsModalStatusScope"); AvaloniaProperty.RegisterAttached<OverlayDialogHost, Control, bool>("IsModalStatusScope");
@@ -57,6 +47,15 @@ public partial class OverlayDialogHost: Canvas
internal static void SetIsInModalStatus(Control obj, bool value) => obj.SetValue(IsInModalStatusProperty, value); internal static void SetIsInModalStatus(Control obj, bool value) => obj.SetValue(IsInModalStatusProperty, value);
public static bool GetIsInModalStatus(Control obj) => obj.GetValue(IsInModalStatusProperty); public static bool GetIsInModalStatus(Control obj) => obj.GetValue(IsInModalStatusProperty);
public static readonly StyledProperty<bool> IsModalStatusReporterProperty = AvaloniaProperty.Register<OverlayDialogHost, bool>(
nameof(IsModalStatusReporter));
public bool IsModalStatusReporter
{
get => GetValue(IsModalStatusReporterProperty);
set => SetValue(IsModalStatusReporterProperty, value);
}
public bool IsInModalStatus public bool IsInModalStatus
{ {
get => GetValue(IsInModalStatusProperty); get => GetValue(IsInModalStatusProperty);
@@ -70,11 +69,6 @@ public partial class OverlayDialogHost: Canvas
ClipToBoundsProperty.OverrideDefaultValue<OverlayDialogHost>(true); ClipToBoundsProperty.OverrideDefaultValue<OverlayDialogHost>(true);
_maskAppearAnimation = CreateOpacityAnimation(true); _maskAppearAnimation = CreateOpacityAnimation(true);
_maskDisappearAnimation = CreateOpacityAnimation(false); _maskDisappearAnimation = CreateOpacityAnimation(false);
// This is only a temporary solution, will be removed in release candidate mode.
IsInModalStatusProperty.Changed.AddClassHandler<OverlayDialogHost, bool>((host, args) =>
{
host.HasModal = args.NewValue.Value;
});
} }
private static Animation CreateOpacityAnimation(bool appear) private static Animation CreateOpacityAnimation(bool appear)
@@ -141,17 +135,24 @@ public partial class OverlayDialogHost: Canvas
} }
} }
private IDisposable? _modalStatusSubscription; private IDisposable? _modalStatusSubscription;
private int? _toplevelHash;
protected sealed override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) protected sealed override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnAttachedToVisualTree(e); base.OnAttachedToVisualTree(e);
var hash = TopLevel.GetTopLevel(this)?.GetHashCode(); _toplevelHash = TopLevel.GetTopLevel(this)?.GetHashCode();
var modalHost = this.GetVisualAncestors().OfType<Control>().FirstOrDefault(GetIsModalStatusScope); var modalHost = this.GetVisualAncestors().OfType<Control>().FirstOrDefault(GetIsModalStatusScope);
if (modalHost is not null) if (modalHost is not null)
{ {
_modalStatusSubscription = this.GetObservable(IsInModalStatusProperty) _modalStatusSubscription = this.GetObservable(IsInModalStatusProperty)
.Subscribe(a => OverlayDialogHost.SetIsInModalStatus(modalHost, a)); .Subscribe(a =>
{
if (IsModalStatusReporter)
{
SetIsInModalStatus(modalHost, a);
}
});
} }
OverlayDialogManager.RegisterHost(this, HostId, hash); OverlayDialogManager.RegisterHost(this, HostId, _toplevelHash);
} }
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
@@ -161,8 +162,7 @@ public partial class OverlayDialogHost: Canvas
_layers[0].Element.Close(); _layers[0].Element.Close();
} }
_modalStatusSubscription?.Dispose(); _modalStatusSubscription?.Dispose();
var hash = TopLevel.GetTopLevel(this)?.GetHashCode(); OverlayDialogManager.UnregisterHost(HostId, _toplevelHash);
OverlayDialogManager.UnregisterHost(HostId, hash);
base.OnDetachedFromVisualTree(e); base.OnDetachedFromVisualTree(e);
} }