Merge pull request #401 from irihitech/dialog
Introduce IsTopLevel to OverlayDialogHost
This commit is contained in:
@@ -71,7 +71,7 @@
|
||||
LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}"
|
||||
RightContent="{Binding $parent[u:UrsaWindow].RightContent}" />
|
||||
<VisualLayerManager>
|
||||
<u:OverlayDialogHost IsModalStatusReporter="True" />
|
||||
<u:OverlayDialogHost IsTopLevel="True" IsModalStatusReporter="True" />
|
||||
</VisualLayerManager>
|
||||
</VisualLayerManager.ChromeOverlayLayer>
|
||||
<Panel>
|
||||
|
||||
@@ -72,7 +72,7 @@ public partial class OverlayDialogHost
|
||||
{
|
||||
if (e.Source is DialogControlBase item)
|
||||
{
|
||||
if (item.IsFullScreen)
|
||||
if (IsTopLevel && item.IsFullScreen)
|
||||
{
|
||||
var top = TopLevel.GetTopLevel(item);
|
||||
if (top is Window w)
|
||||
|
||||
@@ -56,6 +56,7 @@ public partial class OverlayDialogHost: Canvas
|
||||
}
|
||||
|
||||
public bool IsAnimationDisabled { get; set; }
|
||||
public bool IsTopLevel { get; set; }
|
||||
|
||||
static OverlayDialogHost()
|
||||
{
|
||||
@@ -114,7 +115,7 @@ public partial class OverlayDialogHost: Canvas
|
||||
{
|
||||
rec.AddHandler(PointerReleasedEvent, ClickMaskToCloseDialog);
|
||||
}
|
||||
else
|
||||
else if(IsTopLevel)
|
||||
{
|
||||
rec.AddHandler(PointerPressedEvent, DragMaskToMoveWindow);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user