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

Merge pull request #401 from irihitech/dialog

Browse Source 
Introduce IsTopLevel to OverlayDialogHost
This commit is contained in:
Dong Bin
2024-09-12 18:55:59 +08:00
committed by GitHub
parent dc80d80337 a81fe88eb6
commit 927f4121b4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -72,7 +72,7 @@ public partial class OverlayDialogHost
{ {
if (e.Source is DialogControlBase item) if (e.Source is DialogControlBase item)
{ {
if (item.IsFullScreen) if (IsTopLevel && item.IsFullScreen)
{ {
var top = TopLevel.GetTopLevel(item); var top = TopLevel.GetTopLevel(item);
if (top is Window w) if (top is Window w)

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

@@ -56,6 +56,7 @@ public partial class OverlayDialogHost: Canvas
} }
public bool IsAnimationDisabled { get; set; } public bool IsAnimationDisabled { get; set; }
public bool IsTopLevel { get; set; }
static OverlayDialogHost() static OverlayDialogHost()
{ {
@@ -114,7 +115,7 @@ public partial class OverlayDialogHost: Canvas
{ {
rec.AddHandler(PointerReleasedEvent, ClickMaskToCloseDialog); rec.AddHandler(PointerReleasedEvent, ClickMaskToCloseDialog);
} }
else else if(IsTopLevel)
{ {
rec.AddHandler(PointerPressedEvent, DragMaskToMoveWindow); rec.AddHandler(PointerPressedEvent, DragMaskToMoveWindow);
} }