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

feat: pre job: change events to routed events.

Browse Source
This commit is contained in:
rabbitism
2024-02-04 02:07:45 +08:00
parent 0f97da7ce8
commit ed21ee8189
10 changed files with 148 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/IconButtonDemo.axaml
View File

@@ -14,7 +14,7 @@
</UserControl.Resources>
<StackPanel HorizontalAlignment="Left" Spacing="16">
<ToggleSwitch Name="loading" Content="Toggle Loading" />
<u:EnumSelector Name="placement" EnumType="{x:Type common:IconPlacement}" />
<u:EnumSelector Name="placement" EnumType="{x:Type common:Position}" />
<u:IconButton
Content="Hello World"
IconPlacement="{Binding #placement.Value}"

2
src/Ursa/Common/IconPlacement.cs → src/Ursa/Common/Position.cs
View File

@@ -1,6 +1,6 @@
namespace Ursa.Common;
public enum IconPlacement
public enum Position
{
Left,
Top,

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

@@ -5,6 +5,7 @@ using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Ursa.Common;
using Ursa.EventArgs;
namespace Ursa.Controls;

44
src/Ursa/Controls/Dialog/DialogControl.cs
View File

@@ -7,6 +7,7 @@ using Avalonia.Input.GestureRecognizers;
using Avalonia.Interactivity;
using Avalonia.Threading;
using Ursa.Common;
using Ursa.EventArgs;
namespace Ursa.Controls;
@@ -32,9 +33,23 @@ public class DialogControl: ContentControl
internal double? VerticalOffsetRatio { get; set; }
internal bool CanClickOnMaskToClose { get; set; }
internal bool IsCloseButtonVisible { get; set; }
public static readonly RoutedEvent<DialogLayerChangeEventArgs> LayerChangedEvent = RoutedEvent.Register<DialogControl, DialogLayerChangeEventArgs>(
nameof(LayerChanged), RoutingStrategies.Bubble);
public event EventHandler<DialogLayerChangeEventArgs> LayerChanged
{
add => AddHandler(LayerChangedEvent, value);
remove => RemoveHandler(LayerChangedEvent, value);
}
public event EventHandler<DialogLayerChangeEventArgs>? LayerChanged;
public event EventHandler<object?>? DialogControlClosing;
public static readonly RoutedEvent<ResultEventArgs> ClosedEvent = RoutedEvent.Register<DrawerControl, ResultEventArgs>(
nameof(Closed), RoutingStrategies.Bubble);
public event EventHandler<ResultEventArgs> Closed
{
add => AddHandler(ClosedEvent, value);
remove => RemoveHandler(ClosedEvent, value);
}
static DialogControl()
{
@@ -45,9 +60,8 @@ public class DialogControl: ContentControl
{
if (args.OldValue.Value is IDialogContext oldContext)
{
oldContext.RequestClose-= OnContextRequestClose;
oldContext.RequestClose -= OnContextRequestClose;
}
if (args.NewValue.Value is IDialogContext newContext)
{
newContext.RequestClose += OnContextRequestClose;
@@ -99,21 +113,21 @@ public class DialogControl: ContentControl
{
Dispatcher.UIThread.Invoke(CloseDialog);
});
void OnCloseHandler(object sender, object? args)
void OnCloseHandler(object sender, ResultEventArgs? args)
{
if (args is T result)
if (args?.Result is T result)
{
tcs.SetResult(result);
DialogControlClosing-= OnCloseHandler;
}
else
{
tcs.SetResult(default(T));
DialogControlClosing-= OnCloseHandler;
tcs.SetResult(default);
}
RemoveHandler(ClosedEvent, OnCloseHandler);
}
this.DialogControlClosing += OnCloseHandler;
AddHandler(ClosedEvent, OnCloseHandler);
return tcs.Task;
}
@@ -121,7 +135,7 @@ public class DialogControl: ContentControl
private void OnContextRequestClose(object sender, object? args)
{
DialogControlClosing?.Invoke(this, args);
RaiseEvent(new ResultEventArgs(ClosedEvent, args));
}
@@ -129,7 +143,7 @@ public class DialogControl: ContentControl
{
if (o is DialogLayerChangeType t)
{
LayerChanged?.Invoke(this, new DialogLayerChangeEventArgs(t));
RaiseEvent(new DialogLayerChangeEventArgs(LayerChangedEvent, t));
}
}
@@ -138,9 +152,9 @@ public class DialogControl: ContentControl
/// </summary>
/// <param name="sender"></param>
/// <param name="args"></param>
protected internal virtual void OnDialogControlClosing(object sender, object? args)
protected virtual void OnDialogControlClosing(object sender, object? args)
{
DialogControlClosing?.Invoke(this, args);
RaiseEvent(new ResultEventArgs(ClosedEvent, args));
}
internal void SetAsModal(bool modal)
@@ -161,7 +175,7 @@ public class DialogControl: ContentControl
}
else
{
DialogControlClosing?.Invoke(this, null);
OnDialogControlClosing(this, null);
}
}
}

9
src/Ursa/Controls/Dialog/DialogLayerChangeEventArgs.cs
View File

@@ -1,12 +1,19 @@
using Avalonia.Interactivity;
namespace Ursa.Controls;
public class DialogLayerChangeEventArgs
public class DialogLayerChangeEventArgs: RoutedEventArgs
{
public DialogLayerChangeType ChangeType { get; }
public DialogLayerChangeEventArgs(DialogLayerChangeType type)
{
ChangeType = type;
}
public DialogLayerChangeEventArgs(RoutedEvent routedEvent, DialogLayerChangeType type): base(routedEvent)
{
ChangeType = type;
}
}
public enum DialogLayerChangeType

12
src/Ursa/Controls/Dialog/OverlayDialogHost.cs
View File

@@ -163,8 +163,8 @@ public class OverlayDialogHost : Canvas
control.Measure(this.Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
SetToPosition(control);
control.DialogControlClosing += OnDialogControlClosing;
control.LayerChanged += OnDialogLayerChanged;
control.AddHandler(DialogControl.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControl.LayerChangedEvent, OnDialogLayerChanged);
ResetZIndices();
}
@@ -173,8 +173,8 @@ public class OverlayDialogHost : Canvas
if (sender is DialogControl control)
{
Children.Remove(control);
control.DialogControlClosing -= OnDialogControlClosing;
control.LayerChanged -= OnDialogLayerChanged;
control.RemoveHandler(DialogControl.ClosedEvent, OnDialogControlClosing);
control.RemoveHandler(DialogControl.LayerChangedEvent, OnDialogLayerChanged);
if (_dialogs.Contains(control))
{
_dialogs.Remove(control);
@@ -217,8 +217,8 @@ public class OverlayDialogHost : Canvas
control.Measure(this.Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
SetToPosition(control);
control.DialogControlClosing += OnDialogControlClosing;
control.LayerChanged += OnDialogLayerChanged;
control.AddHandler(DialogControl.ClosedEvent, OnDialogControlClosing);
control.AddHandler(DialogControl.LayerChangedEvent, OnDialogLayerChanged);
}
// Handle dialog layer change event

6
src/Ursa/Controls/Drawer/Drawer.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Ursa.Controls;
public static class Drawer
{
}

69
src/Ursa/Controls/Drawer/DrawerControl.cs Normal file
View File

@@ -0,0 +1,69 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Threading;
using Ursa.Common;
using Ursa.EventArgs;
namespace Ursa.Controls;
public class DrawerControl: ContentControl
{
public static readonly StyledProperty<Position> PositionProperty = AvaloniaProperty.Register<DrawerControl, Position>(
nameof(Position));
public Position Position
{
get => GetValue(PositionProperty);
set => SetValue(PositionProperty, value);
}
public static readonly StyledProperty<bool> IsOpenProperty = AvaloniaProperty.Register<DrawerControl, bool>(
nameof(IsOpen));
public bool IsOpen
{
get => GetValue(IsOpenProperty);
set => SetValue(IsOpenProperty, value);
}
public static readonly RoutedEvent<ResultEventArgs> CloseEvent = RoutedEvent.Register<DrawerControl, ResultEventArgs>(
"Close", RoutingStrategies.Bubble);
public event EventHandler<ResultEventArgs> Close
{
add => AddHandler(CloseEvent, value);
remove => RemoveHandler(CloseEvent, value);
}
public Task<T?> ShowAsync<T>(CancellationToken? token = default)
{
var tcs = new TaskCompletionSource<T?>();
token?.Register(() =>
{
Dispatcher.UIThread.Invoke(CloseDrawer);
});
void OnCloseHandler(object sender, ResultEventArgs args)
{
if (args is T result)
{
tcs.SetResult(result);
Close -= OnCloseHandler;
}
else
{
tcs.SetResult(default(T));
Close -= OnCloseHandler;
}
}
this.Close += OnCloseHandler;
return tcs.Task;
}
internal void CloseDrawer()
{
}
}

18
src/Ursa/Controls/IconButton.cs
View File

@@ -44,10 +44,10 @@ public class IconButton: Button
set => SetValue(IsLoadingProperty, value);
}
public static readonly StyledProperty<IconPlacement> IconPlacementProperty = AvaloniaProperty.Register<IconButton, IconPlacement>(
nameof(IconPlacement), defaultValue: IconPlacement.Left);
public static readonly StyledProperty<Position> IconPlacementProperty = AvaloniaProperty.Register<IconButton, Position>(
nameof(IconPlacement), defaultValue: Position.Left);
public IconPlacement IconPlacement
public Position IconPlacement
{
get => GetValue(IconPlacementProperty);
set => SetValue(IconPlacementProperty, value);
@@ -55,7 +55,7 @@ public class IconButton: Button
static IconButton()
{
IconPlacementProperty.Changed.AddClassHandler<IconButton, IconPlacement>((o, e) =>
IconPlacementProperty.Changed.AddClassHandler<IconButton, Position>((o, e) =>
{
o.SetPlacement(e.NewValue.Value, o.Icon);
});
@@ -71,7 +71,7 @@ public class IconButton: Button
SetPlacement(IconPlacement, Icon);
}
private void SetPlacement(IconPlacement placement, object? icon)
private void SetPlacement(Position placement, object? icon)
{
if (icon is null)
{
@@ -83,9 +83,9 @@ public class IconButton: Button
return;
}
PseudoClasses.Set(PC_Empty, false);
PseudoClasses.Set(PC_Left, placement == IconPlacement.Left);
PseudoClasses.Set(PC_Right, placement == IconPlacement.Right);
PseudoClasses.Set(PC_Top, placement == IconPlacement.Top);
PseudoClasses.Set(PC_Bottom, placement == IconPlacement.Bottom);
PseudoClasses.Set(PC_Left, placement == Position.Left);
PseudoClasses.Set(PC_Right, placement == Position.Right);
PseudoClasses.Set(PC_Top, placement == Position.Top);
PseudoClasses.Set(PC_Bottom, placement == Position.Bottom);
}
}

18
src/Ursa/EventArgs/ResultEventArgs.cs Normal file
View File

@@ -0,0 +1,18 @@
using Avalonia.Interactivity;
namespace Ursa.EventArgs;
public class ResultEventArgs: RoutedEventArgs
{
public object? Result { get; set; }
public ResultEventArgs(object? result)
{
Result = result;
}
public ResultEventArgs(RoutedEvent routedEvent, object? result): base(routedEvent)
{
Result = result;
}
}