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

Merge pull request #400 from irihitech/full-dialog

Browse Source 
FullScreen overlay dialog updates
This commit is contained in:
Dong Bin
2024-09-12 11:28:49 +08:00
committed by GitHub
parent 7271fb290a e90189bbca
commit ebbffa8895
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Ursa/Controls/Dialog/DialogControlBase.cs
View File

@@ -53,7 +53,6 @@ public abstract class DialogControlBase : OverlayFeedbackElement
set => SetAndRaise(IsFullScreenProperty, ref _isFullScreen, value); set => SetAndRaise(IsFullScreenProperty, ref _isFullScreen, value);
} }
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);

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

@@ -1,4 +1,5 @@
using Avalonia; using Avalonia;
using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Helpers; using Irihi.Avalonia.Shared.Helpers;
@@ -15,6 +16,8 @@ public partial class OverlayDialogHost
private static void ResetDialogPosition(DialogControlBase control, Size newSize) private static void ResetDialogPosition(DialogControlBase control, Size newSize)
{ {
control.MaxWidth = newSize.Width;
control.MaxHeight = newSize.Height;
if (control.IsFullScreen) if (control.IsFullScreen)
{ {
control.Width = newSize.Width; control.Width = newSize.Width;
@@ -23,8 +26,6 @@ public partial class OverlayDialogHost
SetTop(control, 0); SetTop(control, 0);
return; return;
} }
control.MaxWidth = newSize.Width;
control.MaxHeight = newSize.Height;
var width = newSize.Width - control.Bounds.Width; var width = newSize.Width - control.Bounds.Width;
var height = newSize.Height - control.Bounds.Height; var height = newSize.Height - control.Bounds.Height;
var newLeft = width * control.HorizontalOffsetRatio??0; var newLeft = width * control.HorizontalOffsetRatio??0;
@@ -53,6 +54,7 @@ public partial class OverlayDialogHost
{ {
if (e.Source is DialogControlBase item) if (e.Source is DialogControlBase item)
{ {
if (item.IsFullScreen) return;
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
{ {
var p = e.GetPosition(this); var p = e.GetPosition(this);
@@ -70,7 +72,18 @@ public partial class OverlayDialogHost
{ {
if (e.Source is DialogControlBase item) if (e.Source is DialogControlBase item)
{ {
_lastPoint = e.GetPosition(item); if (item.IsFullScreen)
{
var top = TopLevel.GetTopLevel(item);
if (top is Window w)
{
w.BeginMoveDrag(e);
}
}
else
{
_lastPoint = e.GetPosition(item);
}
} }
} }