diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 0331fa4..2b4fe18 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -50,6 +50,7 @@
IsChecked="{Binding IsCloseButtonVisible}"
IsThreeState="True" />
+
+
+
+
+
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index d096126..6b8bfc6 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -7,68 +7,72 @@
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index 66bb9d9..3800d0f 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -1,154 +1,60 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Ursa.Themes.Semi/Controls/Resizer.axaml b/src/Ursa.Themes.Semi/Controls/Resizer.axaml
index 59e5ced..31556fc 100644
--- a/src/Ursa.Themes.Semi/Controls/Resizer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Resizer.axaml
@@ -1,29 +1,144 @@
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
index f3c6409..eda0add 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
@@ -6,4 +6,6 @@
M2,2H16V16H2V2M22,8V22H8V18H18V8H22M4,4V14H14V4H4Z
M2,2H11V11H2V2M9,4H4V9H9V4M22,13V22H13V13H22M15,20H20V15H15V20M16,8V11H13V8H16M11,16H8V13H11V16Z
12
+ 48
+ 48
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index 08deb07..be9d516 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -205,6 +205,8 @@ public static class Dialog
window.IsCloseButtonVisible = options.IsCloseButtonVisible;
window.ShowInTaskbar = options.ShowInTaskBar;
window.CanDragMove = options.CanDragMove;
+ window.CanResize = options.CanResize;
+ window.IsManagedResizerVisible = options.CanResize;
if (options.StartupLocation == WindowStartupLocation.Manual)
{
if (options.Position is not null)
@@ -229,6 +231,8 @@ public static class Dialog
window.ShowInTaskbar = options.ShowInTaskBar;
window.IsCloseButtonVisible = options.IsCloseButtonVisible;
window.CanDragMove = options.CanDragMove;
+ window.IsManagedResizerVisible = options.CanResize;
+ window.CanResize = options.CanResize;
if (options.StartupLocation == WindowStartupLocation.Manual)
{
if (options.Position is not null)
diff --git a/src/Ursa/Controls/Dialog/DialogControlBase.cs b/src/Ursa/Controls/Dialog/DialogControlBase.cs
index aa0cabb..7ebcd23 100644
--- a/src/Ursa/Controls/Dialog/DialogControlBase.cs
+++ b/src/Ursa/Controls/Dialog/DialogControlBase.cs
@@ -24,10 +24,16 @@ public abstract class DialogControlBase : OverlayFeedbackElement
AvaloniaProperty.RegisterDirect(
nameof(IsFullScreen), o => o.IsFullScreen, (o, v) => o.IsFullScreen = v);
+ public static readonly StyledProperty CanResizeProperty = AvaloniaProperty.Register(
+ nameof(CanResize));
+
protected internal Button? _closeButton;
private bool _isFullScreen;
private Panel? _titleArea;
+ private bool _moveDragging;
+ private Point _moveDragStartPoint;
+
static DialogControlBase()
{
@@ -36,6 +42,12 @@ public abstract class DialogControlBase : OverlayFeedbackElement
IsFullScreenProperty.AffectsPseudoClass(PC_FullScreen);
}
+ public bool CanResize
+ {
+ get => GetValue(CanResizeProperty);
+ set => SetValue(CanResizeProperty, value);
+ }
+
internal HorizontalPosition HorizontalAnchor { get; set; } = HorizontalPosition.Center;
internal VerticalPosition VerticalAnchor { get; set; } = VerticalPosition.Center;
internal HorizontalPosition ActualHorizontalAnchor { get; set; }
@@ -79,17 +91,44 @@ public abstract class DialogControlBase : OverlayFeedbackElement
private void OnTitlePointerPressed(InputElement sender, PointerPressedEventArgs e)
{
- e.Source = this;
+ //e.Source = this;
+ if (ContainerPanel is OverlayDialogHost h)
+ {
+ if (h.IsTopLevel && this.IsFullScreen)
+ {
+ var top = TopLevel.GetTopLevel(this);
+ if (top is Window w)
+ {
+ w.BeginMoveDrag(e);
+ return;
+ }
+ }
+ }
+ if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+ if (IsFullScreen) return;
+ _moveDragging = true;
+ _moveDragStartPoint = e.GetPosition(this);
}
private void OnTitlePointerMove(InputElement sender, PointerEventArgs e)
{
- e.Source = this;
+ //e.Source = this;
+ if (!_moveDragging) return;
+ if (ContainerPanel is null) return;
+ var p = e.GetPosition(this);
+ var left = Canvas.GetLeft(this) + p.X - _moveDragStartPoint.X;
+ var top = Canvas.GetTop(this) + p.Y - _moveDragStartPoint.Y;
+ left = MathHelpers.SafeClamp(left, 0, ContainerPanel.Bounds.Width - Bounds.Width);
+ top = MathHelpers.SafeClamp(top, 0, ContainerPanel.Bounds.Height - Bounds.Height);
+ Canvas.SetLeft(this, left);
+ Canvas.SetTop(this, top);
}
private void OnTitlePointerRelease(InputElement sender, PointerReleasedEventArgs e)
{
- e.Source = this;
+ // e.Source = this;
+ _moveDragging = false;
+ AnchorAndUpdatePositionInfo();
}
private void OnCloseButtonClick(object? sender, RoutedEventArgs args)
@@ -195,4 +234,50 @@ public abstract class DialogControlBase : OverlayFeedbackElement
}
#endregion
+
+ protected internal override void AnchorAndUpdatePositionInfo()
+ {
+ if (ContainerPanel is null) return;
+ ActualHorizontalAnchor = HorizontalPosition.Center;
+ ActualVerticalAnchor = VerticalPosition.Center;
+ double left = Canvas.GetLeft(this);
+ double top = Canvas.GetTop(this);
+ double right = ContainerPanel.Bounds.Width - left - Bounds.Width;
+ double bottom = ContainerPanel.Bounds.Height - top - Bounds.Height;
+ if (ContainerPanel is OverlayDialogHost h)
+ {
+ var snapThickness = h.SnapThickness;
+ if(top < snapThickness.Top)
+ {
+ Canvas.SetTop(this, 0);
+ ActualVerticalAnchor = VerticalPosition.Top;
+ VerticalOffsetRatio = 0;
+ }
+ if(bottom < snapThickness.Bottom)
+ {
+ Canvas.SetTop(this, ContainerPanel.Bounds.Height - Bounds.Height);
+ ActualVerticalAnchor = VerticalPosition.Bottom;
+ VerticalOffsetRatio = 1;
+ }
+ if(left < snapThickness.Left)
+ {
+ Canvas.SetLeft(this, 0);
+ ActualHorizontalAnchor = HorizontalPosition.Left;
+ HorizontalOffsetRatio = 0;
+ }
+ if(right < snapThickness.Right)
+ {
+ Canvas.SetLeft(this, ContainerPanel.Bounds.Width - this.Bounds.Width);
+ ActualHorizontalAnchor = HorizontalPosition.Right;
+ HorizontalOffsetRatio = 1;
+ }
+ }
+ left = Canvas.GetLeft(this);
+ top = Canvas.GetTop(this);
+ right = ContainerPanel.Bounds.Width - left - Bounds.Width;
+ bottom = ContainerPanel.Bounds.Height - top - Bounds.Height;
+
+ HorizontalOffsetRatio = (left + right) == 0 ? 0 : left / (left + right);
+ VerticalOffsetRatio = (top + bottom) == 0 ? 0 : top / (top + bottom);
+ }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 29f5398..f56ae09 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -17,8 +17,17 @@ public class DialogWindow : Window
public const string PART_TitleArea = "PART_TitleArea";
protected internal Button? _closeButton;
+
private Panel? _titleArea;
- public bool CanDragMove { get; set; } = true;
+
+ public static readonly StyledProperty IsManagedResizerVisibleProperty = AvaloniaProperty.Register(
+ nameof(IsManagedResizerVisible));
+
+ public bool IsManagedResizerVisible
+ {
+ get => GetValue(IsManagedResizerVisibleProperty);
+ set => SetValue(IsManagedResizerVisibleProperty, value);
+ }
static DialogWindow()
{
@@ -26,9 +35,11 @@ public class DialogWindow : Window
window.OnDataContextChange(e));
}
+ public bool CanDragMove { get; set; } = true;
+ internal bool? IsCloseButtonVisible { get; set; }
+
protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
- internal bool? IsCloseButtonVisible { get; set; }
private void OnDataContextChange(AvaloniaPropertyChangedEventArgs args)
{
diff --git a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
index 9d3573c..63645c4 100644
--- a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
@@ -30,4 +30,6 @@ public class DialogOptions
public bool ShowInTaskBar { get; set; } = true;
public bool CanDragMove { get; set; } = true;
+
+ public bool CanResize { get; set; }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
index cf300cc..5d99014 100644
--- a/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
@@ -62,4 +62,6 @@ public class OverlayDialogOptions
/// id.
///
public int? TopLevelHashCode { get; set; }
+
+ public bool CanResize { get; set; }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialog.cs b/src/Ursa/Controls/Dialog/OverlayDialog.cs
index cdbeed2..6f23f97 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialog.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialog.cs
@@ -204,6 +204,7 @@ public static class OverlayDialog
options.VerticalAnchor == VerticalPosition.Center ? null : options.VerticalOffset;
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
control.CanLightDismiss = options.CanLightDismiss;
+ control.CanResize = options.CanResize;
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}
@@ -229,6 +230,7 @@ public static class OverlayDialog
control.Title = options.Title;
control.CanLightDismiss = options.CanLightDismiss;
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
+ control.CanResize = options.CanResize;
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}
diff --git a/src/Ursa/Controls/Drawer/CustomDrawerControl.cs b/src/Ursa/Controls/Drawer/CustomDrawerControl.cs
index 51be7c0..956aa3d 100644
--- a/src/Ursa/Controls/Drawer/CustomDrawerControl.cs
+++ b/src/Ursa/Controls/Drawer/CustomDrawerControl.cs
@@ -25,4 +25,9 @@ public class CustomDrawerControl: DrawerControlBase
OnElementClosing(this, null);
}
}
+
+ protected internal override void AnchorAndUpdatePositionInfo()
+ {
+ // throw new NotImplementedException();
+ }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
index 7fedf43..3e93e5b 100644
--- a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
+++ b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
@@ -135,4 +135,9 @@ public class DefaultDrawerControl : DrawerControlBase
RaiseEvent(new ResultEventArgs(ClosedEvent, result));
}
}
+
+ protected internal override void AnchorAndUpdatePositionInfo()
+ {
+ // throw new NotImplementedException();
+ }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Drawer/Drawer.cs b/src/Ursa/Controls/Drawer/Drawer.cs
index b8044c4..1c38fcd 100644
--- a/src/Ursa/Controls/Drawer/Drawer.cs
+++ b/src/Ursa/Controls/Drawer/Drawer.cs
@@ -205,16 +205,17 @@ public static class Drawer
drawer.Position = options.Position;
drawer.IsCloseButtonVisible = options.IsCloseButtonVisible;
drawer.CanLightDismiss = options.CanLightDismiss;
+ drawer.CanResize = options.CanResize;
if (options.Position == Position.Left || options.Position == Position.Right)
{
- drawer.MinWidth = options.MinWidth ?? 0.0;
- drawer.MaxWidth = options.MaxWidth ?? double.PositiveInfinity;
+ if(options.MinWidth is not null) drawer.MinWidth = options.MinWidth.Value;
+ if(options.MaxWidth is not null) drawer.MaxWidth = options.MaxWidth.Value;
}
if (options.Position is Position.Top or Position.Bottom)
{
- drawer.MinHeight = options.MinHeight ?? 0.0;
- drawer.MaxHeight = options.MaxHeight ?? double.PositiveInfinity;
+ if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
+ if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
}
}
@@ -226,16 +227,17 @@ public static class Drawer
drawer.CanLightDismiss = options.CanLightDismiss;
drawer.Buttons = options.Buttons;
drawer.Title = options.Title;
+ drawer.CanResize = options.CanResize;
if (options.Position == Position.Left || options.Position == Position.Right)
{
- drawer.MinWidth = options.MinWidth ?? 0.0;
- drawer.MaxWidth = options.MaxWidth ?? double.PositiveInfinity;
+ if(options.MinWidth is not null) drawer.MinWidth = options.MinWidth.Value;
+ if(options.MaxWidth is not null) drawer.MaxWidth = options.MaxWidth.Value;
}
if (options.Position is Position.Top or Position.Bottom)
{
- drawer.MinHeight = options.MinHeight ?? 0.0;
- drawer.MaxHeight = options.MaxHeight ?? double.PositiveInfinity;
+ if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
+ if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
}
}
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Drawer/DrawerControlBase.cs b/src/Ursa/Controls/Drawer/DrawerControlBase.cs
index f377276..3da1f0e 100644
--- a/src/Ursa/Controls/Drawer/DrawerControlBase.cs
+++ b/src/Ursa/Controls/Drawer/DrawerControlBase.cs
@@ -22,6 +22,15 @@ public abstract class DrawerControlBase: OverlayFeedbackElement
AvaloniaProperty.Register(
nameof(Position), defaultValue: Position.Right);
+ public static readonly StyledProperty CanResizeProperty = AvaloniaProperty.Register(
+ nameof(CanResize));
+
+ public bool CanResize
+ {
+ get => GetValue(CanResizeProperty);
+ set => SetValue(CanResizeProperty, value);
+ }
+
public Position Position
{
get => GetValue(PositionProperty);
diff --git a/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs b/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs
index 04d5e0e..34bdcb4 100644
--- a/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs
+++ b/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs
@@ -20,4 +20,6 @@ public class DrawerOptions
/// The hash code of the top level dialog host. This is used to identify the dialog host if there are multiple dialog hosts with the same id. If this is not provided, the dialog will be added to the first dialog host with the same id.
///
public int? TopLevelHashCode { get; set; }
+
+ public bool CanResize { get; set; }
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
index d53c544..e2f2be3 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
@@ -1,5 +1,4 @@
using Avalonia;
-using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Helpers;
@@ -10,10 +9,8 @@ namespace Ursa.Controls;
public partial class OverlayDialogHost
{
- private Point _lastPoint;
-
- public Thickness SnapThickness { get; set; } = new Thickness(0);
-
+ public Thickness SnapThickness { get; set; } = new(0);
+
private static void ResetDialogPosition(DialogControlBase control, Size newSize)
{
control.MaxWidth = newSize.Width;
@@ -26,138 +23,71 @@ public partial class OverlayDialogHost
SetTop(control, 0);
return;
}
+
var width = newSize.Width - control.Bounds.Width;
var height = newSize.Height - control.Bounds.Height;
- var newLeft = width * control.HorizontalOffsetRatio??0;
- var newTop = height * control.VerticalOffsetRatio??0;
- if(control.ActualHorizontalAnchor == HorizontalPosition.Left)
- {
- newLeft = 0;
- }
- if (control.ActualHorizontalAnchor == HorizontalPosition.Right)
- {
- newLeft = newSize.Width - control.Bounds.Width;
- }
- if (control.ActualVerticalAnchor == VerticalPosition.Top)
- {
- newTop = 0;
- }
- if (control.ActualVerticalAnchor == VerticalPosition.Bottom)
- {
- newTop = newSize.Height - control.Bounds.Height;
- }
+ var newLeft = width * control.HorizontalOffsetRatio ?? 0;
+ var newTop = height * control.VerticalOffsetRatio ?? 0;
+ if (control.ActualHorizontalAnchor == HorizontalPosition.Left) newLeft = 0;
+ if (control.ActualHorizontalAnchor == HorizontalPosition.Right) newLeft = newSize.Width - control.Bounds.Width;
+ if (control.ActualVerticalAnchor == VerticalPosition.Top) newTop = 0;
+ if (control.ActualVerticalAnchor == VerticalPosition.Bottom) newTop = newSize.Height - control.Bounds.Height;
SetLeft(control, Math.Max(0.0, newLeft));
SetTop(control, Math.Max(0.0, newTop));
}
-
- protected override void OnPointerMoved(PointerEventArgs e)
- {
- if (e.Source is DialogControlBase item)
- {
- if (item.IsFullScreen) return;
- if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
- {
- var p = e.GetPosition(this);
- var left = p.X - _lastPoint.X;
- var top = p.Y - _lastPoint.Y;
- left = MathHelpers.SafeClamp(left, 0, Bounds.Width - item.Bounds.Width);
- top = MathHelpers.SafeClamp(top, 0, Bounds.Height - item.Bounds.Height);
- SetLeft(item, left);
- SetTop(item, top);
- }
- }
- }
-
- protected override void OnPointerPressed(PointerPressedEventArgs e)
- {
- if (e.Source is DialogControlBase item)
- {
- if (IsTopLevel && item.IsFullScreen)
- {
- var top = TopLevel.GetTopLevel(item);
- if (top is Window w)
- {
- w.BeginMoveDrag(e);
- }
- }
- else
- {
- _lastPoint = e.GetPosition(item);
- }
- }
- }
-
- protected override void OnPointerReleased(PointerReleasedEventArgs e)
- {
- if (e.Source is DialogControlBase item)
- {
- AnchorAndUpdatePositionInfo(item);
- }
- }
internal void AddDialog(DialogControlBase control)
{
PureRectangle? mask = null;
- if (control.CanLightDismiss)
- {
- mask = CreateOverlayMask(false, control.CanLightDismiss);
- }
- if (mask is not null)
- {
- Children.Add(mask);
- }
- this.Children.Add(control);
+ if (control.CanLightDismiss) mask = CreateOverlayMask(false, control.CanLightDismiss);
+ if (mask is not null) Children.Add(mask);
+ Children.Add(control);
_layers.Add(new DialogPair(mask, control, false));
if (control.IsFullScreen)
{
control.Width = Bounds.Width;
control.Height = Bounds.Height;
}
+
control.MaxWidth = Bounds.Width;
control.MaxHeight = Bounds.Height;
- control.Measure(this.Bounds.Size);
+ control.Measure(Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
SetToPosition(control);
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
ResetZIndices();
}
-
+
private async void OnDialogControlClosing(object? sender, object? e)
{
- if (sender is DialogControlBase control)
+ if (sender is not DialogControlBase control) return;
+ var layer = _layers.FirstOrDefault(a => a.Element == control);
+ if (layer is null) return;
+ _layers.Remove(layer);
+
+ control.RemoveHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
+ control.RemoveHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
+ layer.Mask?.RemoveHandler(PointerPressedEvent, DragMaskToMoveWindow);
+
+ Children.Remove(control);
+
+ if (layer.Mask is not null)
{
- var layer = _layers.FirstOrDefault(a => a.Element == control);
- if (layer is null) return;
- _layers.Remove(layer);
-
- control.RemoveHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
- control.RemoveHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
- control.RemoveHandler(PointerPressedEvent, DragMaskToMoveWindow);
-
- Children.Remove(control);
-
- if (layer.Mask is not null)
+ Children.Remove(layer.Mask);
+ if (layer.Modal)
{
- Children.Remove(layer.Mask);
-
- if (layer.Modal)
- {
- _modalCount--;
- IsInModalStatus = _modalCount > 0;
- if (!IsAnimationDisabled)
- {
- await _maskDisappearAnimation.RunAsync(layer.Mask);
- }
- }
+ _modalCount--;
+ IsInModalStatus = _modalCount > 0;
+ if (!IsAnimationDisabled) await MaskDisappearAnimation.RunAsync(layer.Mask);
}
-
- ResetZIndices();
}
+
+ ResetZIndices();
}
///
- /// Add a dialog as a modal dialog to the host
+ /// Add a dialog as a modal dialog to the host
///
///
internal void AddModalDialog(DialogControlBase control)
@@ -166,24 +96,22 @@ public partial class OverlayDialogHost
_layers.Add(new DialogPair(mask, control));
control.SetAsModal(true);
ResetZIndices();
- this.Children.Add(mask);
- this.Children.Add(control);
+ Children.Add(mask);
+ Children.Add(control);
if (control.IsFullScreen)
{
control.Width = Bounds.Width;
control.Height = Bounds.Height;
}
+
control.MaxWidth = Bounds.Width;
control.MaxHeight = Bounds.Height;
- control.Measure(this.Bounds.Size);
+ control.Measure(Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
SetToPosition(control);
control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
- if (!IsAnimationDisabled)
- {
- _maskAppearAnimation.RunAsync(mask);
- }
+ if (!IsAnimationDisabled) MaskAppearAnimation.RunAsync(mask);
var element = control.GetVisualDescendants().OfType().FirstOrDefault(a => a.Focusable);
element?.Focus();
@@ -200,9 +128,9 @@ public partial class OverlayDialogHost
return;
var layer = _layers.FirstOrDefault(a => a.Element == control);
if (layer is null) return;
- int index = _layers.IndexOf(layer);
+ var index = _layers.IndexOf(layer);
_layers.Remove(layer);
- int newIndex = index;
+ var newIndex = index;
switch (e.ChangeType)
{
case DialogLayerChangeType.BringForward:
@@ -222,63 +150,21 @@ public partial class OverlayDialogHost
_layers.Insert(newIndex, layer);
ResetZIndices();
}
-
+
private void SetToPosition(DialogControlBase? control)
{
if (control is null) return;
- double left = GetLeftPosition(control);
- double top = GetTopPosition(control);
+ var left = GetLeftPosition(control);
+ var top = GetTopPosition(control);
SetLeft(control, left);
SetTop(control, top);
- AnchorAndUpdatePositionInfo(control);
- }
-
- private void AnchorAndUpdatePositionInfo(DialogControlBase control)
- {
- control.ActualHorizontalAnchor = HorizontalPosition.Center;
- control.ActualVerticalAnchor = VerticalPosition.Center;
- double left = GetLeft(control);
- double top = GetTop(control);
- double right = Bounds.Width - left - control.Bounds.Width;
- double bottom = Bounds.Height - top - control.Bounds.Height;
- if(top < SnapThickness.Top)
- {
- SetTop(control, 0);
- control.ActualVerticalAnchor = VerticalPosition.Top;
- control.VerticalOffsetRatio = 0;
- }
- if(bottom < SnapThickness.Bottom)
- {
- SetTop(control, Bounds.Height - control.Bounds.Height);
- control.ActualVerticalAnchor = VerticalPosition.Bottom;
- control.VerticalOffsetRatio = 1;
- }
- if(left < SnapThickness.Left)
- {
- SetLeft(control, 0);
- control.ActualHorizontalAnchor = HorizontalPosition.Left;
- control.HorizontalOffsetRatio = 0;
- }
- if(right < SnapThickness.Right)
- {
- SetLeft(control, Bounds.Width - control.Bounds.Width);
- control.ActualHorizontalAnchor = HorizontalPosition.Right;
- control.HorizontalOffsetRatio = 1;
- }
- left = GetLeft(control);
- top = GetTop(control);
- right = Bounds.Width - left - control.Bounds.Width;
- bottom = Bounds.Height - top - control.Bounds.Height;
-
- control.HorizontalOffsetRatio = (left + right) == 0 ? 0 : left / (left + right);
- control.VerticalOffsetRatio = (top + bottom) == 0 ? 0 : top / (top + bottom);
+ control.AnchorAndUpdatePositionInfo();
}
private double GetLeftPosition(DialogControlBase control)
{
- double left;
- double offset = Math.Max(0, control.HorizontalOffset ?? 0);
- left = this.Bounds.Width - control.Bounds.Width;
+ var offset = Math.Max(0, control.HorizontalOffset ?? 0);
+ var left = Bounds.Width - control.Bounds.Width;
if (control.HorizontalAnchor == HorizontalPosition.Center)
{
left *= 0.5;
@@ -290,20 +176,18 @@ public partial class OverlayDialogHost
}
else if (control.HorizontalAnchor == HorizontalPosition.Right)
{
- double leftOffset = Bounds.Width - control.Bounds.Width - offset;
+ var leftOffset = Bounds.Width - control.Bounds.Width - offset;
leftOffset = Math.Max(0, leftOffset);
- if(control.HorizontalOffset.HasValue)
- {
- left = MathHelpers.SafeClamp(left, 0, leftOffset);
- }
+ if (control.HorizontalOffset.HasValue) left = MathHelpers.SafeClamp(left, 0, leftOffset);
}
+
return left;
- }
+ }
private double GetTopPosition(DialogControlBase control)
{
- double offset = Math.Max(0, control.VerticalOffset ?? 0);
- var top = this.Bounds.Height - control.Bounds.Height;
+ var offset = Math.Max(0, control.VerticalOffset ?? 0);
+ var top = Bounds.Height - control.Bounds.Height;
if (control.VerticalAnchor == VerticalPosition.Center)
{
top *= 0.5;
@@ -318,8 +202,7 @@ public partial class OverlayDialogHost
var topOffset = Math.Max(0, Bounds.Height - control.Bounds.Height - offset);
top = MathHelpers.SafeClamp(top, 0, topOffset);
}
+
return top;
}
-
-
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
index e6bec9d..438d8a9 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
@@ -42,7 +42,7 @@ public partial class OverlayDialogHost
}
else
{
- await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask));
+ await Task.WhenAll(animation.RunAsync(control), MaskAppearAnimation.RunAsync(mask));
}
}
}
@@ -67,7 +67,7 @@ public partial class OverlayDialogHost
}
else
{
- await Task.WhenAll(animation.RunAsync(control), _maskAppearAnimation.RunAsync(mask));
+ await Task.WhenAll(animation.RunAsync(control), MaskAppearAnimation.RunAsync(mask));
}
var element = control.GetVisualDescendants().OfType().FirstOrDefault(a => a.Focusable);
element?.Focus();
@@ -174,7 +174,7 @@ public partial class OverlayDialogHost
if (!IsAnimationDisabled)
{
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false);
- await Task.WhenAll(disappearAnimation.RunAsync(control), _maskDisappearAnimation.RunAsync(layer.Mask));
+ await Task.WhenAll(disappearAnimation.RunAsync(control), MaskDisappearAnimation.RunAsync(layer.Mask));
}
Children.Remove(layer.Mask);
}
diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
index 164366b..3dabc19 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
@@ -14,8 +14,8 @@ namespace Ursa.Controls;
public partial class OverlayDialogHost: Canvas
{
- private static readonly Animation _maskAppearAnimation;
- private static readonly Animation _maskDisappearAnimation;
+ private static readonly Animation MaskAppearAnimation;
+ private static readonly Animation MaskDisappearAnimation;
private readonly List _layers = new List(10);
@@ -61,8 +61,8 @@ public partial class OverlayDialogHost: Canvas
static OverlayDialogHost()
{
ClipToBoundsProperty.OverrideDefaultValue(true);
- _maskAppearAnimation = CreateOpacityAnimation(true);
- _maskDisappearAnimation = CreateOpacityAnimation(false);
+ MaskAppearAnimation = CreateOpacityAnimation(true);
+ MaskDisappearAnimation = CreateOpacityAnimation(false);
}
private static Animation CreateOpacityAnimation(bool appear)
@@ -128,28 +128,21 @@ public partial class OverlayDialogHost: Canvas
{
return;
}
- if (sender is PureRectangle mask)
+ if (sender is not PureRectangle mask) return;
+ if(TopLevel.GetTopLevel(mask) is Window window)
{
- var window = this.GetVisualAncestors().OfType().FirstOrDefault();
- if(window is not null)
- {
- window.BeginMoveDrag(e);
- }
+ window.BeginMoveDrag(e);
}
}
private void ClickMaskToCloseDialog(object? sender, PointerReleasedEventArgs e)
{
- if (sender is PureRectangle border)
- {
- var layer = _layers.FirstOrDefault(a => a.Mask == border);
- if (layer is not null)
- {
- layer.Element.Close();
- border.RemoveHandler(PointerReleasedEvent, ClickMaskToCloseDialog);
- border.RemoveHandler(PointerPressedEvent, DragMaskToMoveWindow);
- }
- }
+ if (sender is not PureRectangle border) return;
+ var layer = _layers.FirstOrDefault(a => a.Mask == border);
+ if (layer is null) return;
+ border.RemoveHandler(PointerReleasedEvent, ClickMaskToCloseDialog);
+ border.RemoveHandler(PointerPressedEvent, DragMaskToMoveWindow);
+ layer.Element.Close();
}
private IDisposable? _modalStatusSubscription;
private int? _toplevelHash;
diff --git a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
index 50cc65a..131b490 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
@@ -1,90 +1,201 @@
using Avalonia;
using Avalonia.Controls;
+using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Threading;
+using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Contracts;
+using Irihi.Avalonia.Shared.Helpers;
using Ursa.EventArgs;
namespace Ursa.Controls.OverlayShared;
-public abstract class OverlayFeedbackElement: ContentControl
+public abstract class OverlayFeedbackElement : ContentControl
{
public static readonly StyledProperty IsClosedProperty =
- AvaloniaProperty.Register(nameof(IsClosed), defaultValue: true);
+ AvaloniaProperty.Register(nameof(IsClosed), true);
+
+ public static readonly RoutedEvent ClosedEvent =
+ RoutedEvent.Register(
+ nameof(Closed), RoutingStrategies.Bubble);
+
+ private bool _resizeDragging;
+
+ protected Panel? ContainerPanel;
+ private Rect _resizeDragStartBounds;
+ private Point _resizeDragStartPoint;
+
+ private WindowEdge? _windowEdge;
+
+ static OverlayFeedbackElement()
+ {
+ FocusableProperty.OverrideDefaultValue(false);
+ DataContextProperty.Changed.AddClassHandler((o, e) =>
+ o.OnDataContextChange(e));
+ ClosedEvent.AddClassHandler((o, e) => o.OnClosed(e));
+ }
public bool IsClosed
{
get => GetValue(IsClosedProperty);
set => SetValue(IsClosedProperty, value);
}
-
- static OverlayFeedbackElement()
- {
- FocusableProperty.OverrideDefaultValue(false);
- DataContextProperty.Changed.AddClassHandler((o, e) => o.OnDataContextChange(e));
- ClosedEvent.AddClassHandler((o,e)=>o.OnClosed(e));
- }
private void OnClosed(ResultEventArgs _)
{
- SetCurrentValue(IsClosedProperty,true);
+ SetCurrentValue(IsClosedProperty, true);
}
- public static readonly RoutedEvent ClosedEvent = RoutedEvent.Register(
- nameof(Closed), RoutingStrategies.Bubble);
-
public event EventHandler Closed
{
add => AddHandler(ClosedEvent, value);
remove => RemoveHandler(ClosedEvent, value);
}
-
+
private void OnDataContextChange(AvaloniaPropertyChangedEventArgs args)
{
- if (args.OldValue.Value is IDialogContext oldContext)
- {
- oldContext.RequestClose -= OnContextRequestClose;
- }
- if (args.NewValue.Value is IDialogContext newContext)
- {
- newContext.RequestClose += OnContextRequestClose;
- }
+ if (args.OldValue.Value is IDialogContext oldContext) oldContext.RequestClose -= OnContextRequestClose;
+ if (args.NewValue.Value is IDialogContext newContext) newContext.RequestClose += OnContextRequestClose;
}
-
+
protected virtual void OnElementClosing(object? sender, object? args)
{
RaiseEvent(new ResultEventArgs(ClosedEvent, args));
}
-
+
private void OnContextRequestClose(object? sender, object? args)
{
RaiseEvent(new ResultEventArgs(ClosedEvent, args));
}
-
+
public Task ShowAsync(CancellationToken? token = default)
- {
+ {
var tcs = new TaskCompletionSource();
- token?.Register(() =>
- {
- Dispatcher.UIThread.Invoke(Close);
- });
-
+ token?.Register(() => { Dispatcher.UIThread.Invoke(Close); });
+
void OnCloseHandler(object? sender, ResultEventArgs? args)
{
if (args?.Result is T result)
- {
tcs.SetResult(result);
- }
else
- {
tcs.SetResult(default);
- }
RemoveHandler(ClosedEvent, OnCloseHandler);
}
AddHandler(ClosedEvent, OnCloseHandler);
return tcs.Task;
}
-
+
public abstract void Close();
+
+ internal void BeginResizeDrag(WindowEdge windowEdge, PointerPressedEventArgs e)
+ {
+ if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+ _resizeDragging = true;
+ _resizeDragStartPoint = e.GetPosition(this);
+ _resizeDragStartBounds = Bounds;
+ _windowEdge = windowEdge;
+ }
+
+ internal void BeginMoveDrag(PointerPressedEventArgs e)
+ {
+ if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+ _resizeDragging = true;
+ _resizeDragStartPoint = e.GetPosition(this);
+ _resizeDragStartBounds = Bounds;
+ _windowEdge = null;
+ }
+
+ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+ {
+ base.OnAttachedToVisualTree(e);
+ ContainerPanel = this.FindAncestorOfType();
+ }
+
+ protected override void OnPointerReleased(PointerReleasedEventArgs e)
+ {
+ base.OnPointerReleased(e);
+ _resizeDragging = false;
+ }
+
+ protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+ {
+ base.OnPointerCaptureLost(e);
+ _resizeDragging = false;
+ }
+
+ protected override void OnPointerMoved(PointerEventArgs e)
+ {
+ base.OnPointerMoved(e);
+ if (!_resizeDragging || _windowEdge is null) return;
+ var point = e.GetPosition(this);
+ Vector diff = point - _resizeDragStartPoint;
+ var left = Canvas.GetLeft(this);
+ var top = Canvas.GetTop(this);
+ var width = _windowEdge is WindowEdge.West or WindowEdge.NorthWest or WindowEdge.SouthWest
+ ? Bounds.Width : _resizeDragStartBounds.Width;
+ var height = _windowEdge is WindowEdge.North or WindowEdge.NorthEast or WindowEdge.NorthWest
+ ? Bounds.Height : _resizeDragStartBounds.Height;
+ var newBounds = CalculateNewBounds(left, top, width, height, diff, ContainerPanel?.Bounds, _windowEdge.Value);
+ Canvas.SetLeft(this, newBounds.Left);
+ Canvas.SetTop(this, newBounds.Top);
+ SetCurrentValue(WidthProperty, newBounds.Width);
+ SetCurrentValue(HeightProperty, newBounds.Height);
+ AnchorAndUpdatePositionInfo();
+ }
+
+ private Rect CalculateNewBounds(double left, double top, double width, double height, Vector diff, Rect? containerBounds,
+ WindowEdge windowEdge)
+ {
+ diff = CoerceDelta(left, top, width, height, diff, containerBounds, windowEdge);
+ switch (windowEdge)
+ {
+ case WindowEdge.North:
+ top += diff.Y; height -= diff.Y;
+ break;
+ case WindowEdge.NorthEast:
+ top += diff.Y; width += diff.X; height -= diff.Y;
+ break;
+ case WindowEdge.East:
+ width += diff.X;
+ break;
+ case WindowEdge.SouthEast:
+ width += diff.X; height += diff.Y;
+ break;
+ case WindowEdge.South:
+ height += diff.Y;
+ break;
+ case WindowEdge.SouthWest:
+ left += diff.X; width -= diff.X; height += diff.Y;
+ break;
+ case WindowEdge.West:
+ left += diff.X; width -= diff.X;
+ break;
+ case WindowEdge.NorthWest:
+ left += diff.X; top += diff.Y; width -= diff.X; height -= diff.Y;
+ break;
+ }
+ return new Rect(left, top, width, height);
+ }
+
+ private Vector CoerceDelta(double left, double top, double width, double height, Vector diff, Rect? containerBounds,
+ WindowEdge windowEdge)
+ {
+ if (containerBounds is null) return diff;
+ var minX = windowEdge is WindowEdge.West or WindowEdge.NorthWest or WindowEdge.SouthWest
+ ? -left
+ : -width;
+ var minY = windowEdge is WindowEdge.North or WindowEdge.NorthEast or WindowEdge.NorthWest
+ ? -top
+ : -height;
+ var maxX = windowEdge is WindowEdge.West or WindowEdge.NorthWest or WindowEdge.SouthWest
+ ? width-MinWidth
+ : containerBounds.Value.Width - left - width;
+ var maxY = windowEdge is WindowEdge.North or WindowEdge.NorthEast or WindowEdge.NorthWest
+ ? height-MinWidth
+ : containerBounds.Value.Height - top - height;
+ return new Vector(MathHelpers.SafeClamp(diff.X, minX, maxX), MathHelpers.SafeClamp(diff.Y, minY, maxY));
+ }
+
+ protected internal abstract void AnchorAndUpdatePositionInfo();
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Resizers/DialogResizer.cs b/src/Ursa/Controls/Resizers/DialogResizer.cs
new file mode 100644
index 0000000..b71fc79
--- /dev/null
+++ b/src/Ursa/Controls/Resizers/DialogResizer.cs
@@ -0,0 +1,75 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Irihi.Avalonia.Shared.Helpers;
+
+namespace Ursa.Controls;
+
+public class DialogResizer: TemplatedControl
+{
+ public const string PART_Top = "PART_Top";
+ public const string PART_Bottom = "PART_Bottom";
+ public const string PART_Left = "PART_Left";
+ public const string PART_Right = "PART_Right";
+ public const string PART_TopLeft = "PART_TopLeft";
+ public const string PART_TopRight = "PART_TopRight";
+ public const string PART_BottomLeft = "PART_BottomLeft";
+ public const string PART_BottomRight = "PART_BottomRight";
+
+ private Thumb? _top;
+ private Thumb? _bottom;
+ private Thumb? _left;
+ private Thumb? _right;
+ private Thumb? _topLeft;
+ private Thumb? _topRight;
+ private Thumb? _bottomLeft;
+ private Thumb? _bottomRight;
+
+ public static readonly StyledProperty ResizeDirectionProperty = AvaloniaProperty.Register(
+ nameof(ResizeDirection), ResizeDirection.All);
+
+ ///
+ /// Defines what direction the dialog is allowed to be resized.
+ ///
+ public ResizeDirection ResizeDirection
+ {
+ get => GetValue(ResizeDirectionProperty);
+ set => SetValue(ResizeDirectionProperty, value);
+ }
+
+ static DialogResizer()
+ {
+ ResizeDirectionProperty.Changed.AddClassHandler((resizer, e) => resizer.OnResizeDirectionChanged(e));
+ }
+
+ private void OnResizeDirectionChanged(AvaloniaPropertyChangedEventArgs args)
+ {
+ UpdateThumbVisibility(args.NewValue.Value);
+ }
+
+ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+ {
+ base.OnApplyTemplate(e);
+ _top = e.NameScope.Find(PART_Top);
+ _bottom = e.NameScope.Find(PART_Bottom);
+ _left = e.NameScope.Find(PART_Left);
+ _right = e.NameScope.Find(PART_Right);
+ _topLeft = e.NameScope.Find(PART_TopLeft);
+ _topRight = e.NameScope.Find(PART_TopRight);
+ _bottomLeft = e.NameScope.Find(PART_BottomLeft);
+ _bottomRight = e.NameScope.Find(PART_BottomRight);
+ UpdateThumbVisibility(ResizeDirection);
+ }
+
+ private void UpdateThumbVisibility(ResizeDirection direction)
+ {
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.Top), _top);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.Bottom), _bottom);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.Left), _left);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.Right), _right);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.TopLeft), _topLeft);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.TopRight), _topRight);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.BottomLeft), _bottomLeft);
+ IsVisibleProperty.SetValue(direction.HasFlag(ResizeDirection.BottomRight), _bottomRight);
+ }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Resizers/DialogResizerThumb.cs b/src/Ursa/Controls/Resizers/DialogResizerThumb.cs
new file mode 100644
index 0000000..6face14
--- /dev/null
+++ b/src/Ursa/Controls/Resizers/DialogResizerThumb.cs
@@ -0,0 +1,48 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Ursa.Controls.OverlayShared;
+
+namespace Ursa.Controls;
+
+public class DialogResizerThumb: Thumb
+{
+ private OverlayFeedbackElement? _dialog;
+
+ public static readonly StyledProperty ResizeDirectionProperty = AvaloniaProperty.Register(
+ nameof(ResizeDirection));
+
+ public ResizeDirection ResizeDirection
+ {
+ get => GetValue(ResizeDirectionProperty);
+ set => SetValue(ResizeDirectionProperty, value);
+ }
+
+ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+ {
+ base.OnApplyTemplate(e);
+ _dialog = this.FindLogicalAncestorOfType();
+ }
+
+ protected override void OnPointerPressed(PointerPressedEventArgs e)
+ {
+ base.OnPointerPressed(e);
+ if (_dialog is null) return;
+ if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+ var windowEdge = ResizeDirection switch
+ {
+ ResizeDirection.Top => WindowEdge.North,
+ ResizeDirection.TopRight => WindowEdge.NorthEast,
+ ResizeDirection.Right => WindowEdge.East,
+ ResizeDirection.BottomRight => WindowEdge.SouthEast,
+ ResizeDirection.Bottom => WindowEdge.South,
+ ResizeDirection.BottomLeft => WindowEdge.SouthWest,
+ ResizeDirection.Left => WindowEdge.West,
+ ResizeDirection.TopLeft => WindowEdge.NorthWest,
+ _ => throw new ArgumentOutOfRangeException()
+ };
+ _dialog.BeginResizeDrag(windowEdge, e);
+ }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Resizers/ResizeDirection.cs b/src/Ursa/Controls/Resizers/ResizeDirection.cs
index f6b5899..7d3ba67 100644
--- a/src/Ursa/Controls/Resizers/ResizeDirection.cs
+++ b/src/Ursa/Controls/Resizers/ResizeDirection.cs
@@ -1,13 +1,18 @@
namespace Ursa.Controls;
+[Flags]
public enum ResizeDirection
{
- Top,
- Bottom,
- Left,
- Right,
- TopLeft,
- TopRight,
- BottomLeft,
- BottomRight,
+ Top = 1,
+ Bottom = 2,
+ Left = 4,
+ Right = 8,
+ TopLeft = 16,
+ TopRight = 32,
+ BottomLeft = 64,
+ BottomRight = 128,
+
+ Sides = Top | Bottom | Left | Right,
+ Corners = TopLeft | TopRight | BottomLeft | BottomRight,
+ All = Sides | Corners,
}
\ No newline at end of file