diff --git a/demo/Ursa.Demo/Assets/IRIHI.png b/demo/Ursa.Demo/Assets/IRIHI.png new file mode 100644 index 0000000..3f405aa Binary files /dev/null and b/demo/Ursa.Demo/Assets/IRIHI.png differ diff --git a/demo/Ursa.Demo/Assets/WORLD.png b/demo/Ursa.Demo/Assets/WORLD.png new file mode 100644 index 0000000..7c5b71f Binary files /dev/null and b/demo/Ursa.Demo/Assets/WORLD.png differ diff --git a/demo/Ursa.Demo/Models/MenuKeys.cs b/demo/Ursa.Demo/Models/MenuKeys.cs index 8faf23a..17bf7b3 100644 --- a/demo/Ursa.Demo/Models/MenuKeys.cs +++ b/demo/Ursa.Demo/Models/MenuKeys.cs @@ -2,11 +2,13 @@ namespace Ursa.Demo; public static class MenuKeys { + public const string MenuKeyIntroduction = "Introduction"; public const string MenuKeyBadge = "Badge"; public const string MenuKeyBanner = "Banner"; public const string MenuKeyButtonGroup = "ButtonGroup"; public const string MenuKeyDivider = "Divider"; public const string MenuKeyDualBadge = "DualBadge"; + public const string MenuKeyImageViewer = "ImageViewer"; public const string MenuKeyIpBox = "IPv4Box"; public const string MenuKeyKeyGestureInput = "KeyGestureInput"; public const string MenuKeyLoading = "Loading"; diff --git a/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml new file mode 100644 index 0000000..d2f956f --- /dev/null +++ b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs new file mode 100644 index 0000000..7aa908c --- /dev/null +++ b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs @@ -0,0 +1,14 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; + +namespace Ursa.Demo.Pages; + +public partial class ImageViewerDemo : UserControl +{ + public ImageViewerDemo() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml new file mode 100644 index 0000000..560ab49 --- /dev/null +++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml @@ -0,0 +1,305 @@ + + + + + + M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z + + + + + + + + + + + + + + + + + M12 16C13.9818 16 15.7453 14.3394 16.7142 11.8589C17.3163 11.6122 17.8892 10.8644 18.1508 9.88823C18.4909 8.61881 18.4234 7.48536 17.4964 7.13266C17.4064 2.7111 15.6617 1 12 1C8.33858 1 6.59387 2.71088 6.50372 7.13179C5.57454 7.48354 5.50668 8.61777 5.84709 9.8882C6.10904 10.8658 6.68318 11.6143 7.28626 11.8599C8.2552 14.3398 10.0186 16 12 16Z M19.6049 22C20.8385 22 21.7171 20.8487 20.867 19.9547C19.1971 18.1985 15.853 17 12 17C8.14699 17 4.80292 18.1985 3.133 19.9547C2.2829 20.8487 3.16148 22 4.39513 22H19.6049Z + M10.7525 1.90411C11.1451 0.698628 12.8549 0.698631 13.2475 1.90411L15.2395 8.01946H21.6858C22.9565 8.01946 23.4848 9.64143 22.4568 10.3865L17.2417 14.1659L19.2337 20.2813C19.6263 21.4868 18.2431 22.4892 17.2151 21.7442L12 17.9647L6.78489 21.7442C5.75687 22.4892 4.37368 21.4868 4.76635 20.2813L6.75834 14.1659L1.54323 10.3865C0.515206 9.64142 1.04354 8.01946 2.31425 8.01946H8.76048L10.7525 1.90411Z + M7.99973 5.07197C7.19713 5.53535 6.20729 5.53113 5.40866 5.06092L5.1637 4.91669C4.55751 4.55978 3.77662 4.65563 3.34264 5.20927C2.69567 6.03462 2.17585 6.94251 1.79166 7.90124C1.53027 8.55354 1.83733 9.27693 2.449 9.62286L2.69407 9.76145C3.50107 10.2178 4.00002 11.0732 4.00002 12.0003C4.00002 12.9271 3.50145 13.7822 2.69492 14.2387L2.44842 14.3783C1.83596 14.725 1.52888 15.4497 1.79213 16.1024C1.98358 16.577 2.21048 17.044 2.47374 17.5C2.73723 17.9564 3.0285 18.3868 3.34416 18.7902C3.77773 19.3443 4.5588 19.4406 5.16498 19.0834L5.40839 18.9399C6.20714 18.4692 7.19739 18.4648 8.0003 18.9284C8.80291 19.3918 9.29417 20.2511 9.28627 21.1778L9.28386 21.4601C9.27787 22.1629 9.75107 22.7906 10.4468 22.8903C11.4692 23.0368 12.5154 23.0404 13.5537 22.8927C14.2499 22.7936 14.7231 22.1653 14.7169 21.462L14.7143 21.1785C14.7061 20.2514 15.1974 19.3916 16.0003 18.928C16.8029 18.4647 17.7927 18.4689 18.5914 18.9391L18.8363 19.0833C19.4425 19.4402 20.2234 19.3444 20.6574 18.7907C21.3044 17.9654 21.8242 17.0575 22.2084 16.0988C22.4698 15.4465 22.1627 14.7231 21.551 14.3772L21.306 14.2386C20.499 13.7822 20 12.9268 20 11.9997C20 11.0729 20.4986 10.2178 21.3051 9.76126L21.5516 9.62174C22.1641 9.27506 22.4712 8.55029 22.2079 7.89761C22.0165 7.42297 21.7896 6.95598 21.5263 6.50001C21.2628 6.04362 20.9715 5.61325 20.6559 5.20982C20.2223 4.65568 19.4412 4.55944 18.8351 4.91665L18.5916 5.06009C17.7929 5.53078 16.8026 5.53519 15.9997 5.07163C15.1971 4.60825 14.7059 3.74891 14.7138 2.82218L14.7162 2.53994C14.7222 1.83708 14.249 1.20945 13.5532 1.10973C12.5308 0.963214 11.4846 0.959581 10.4464 1.10733C9.75011 1.20641 9.27691 1.83473 9.28317 2.53798L9.28569 2.82154C9.29395 3.74862 8.80264 4.60841 7.99973 5.07197ZM14 15.4641C15.9132 14.3595 16.5687 11.9132 15.4641 9.99999C14.3595 8.08682 11.9132 7.43132 10 8.53589C8.08684 9.64046 7.43134 12.0868 8.53591 14C9.64048 15.9132 12.0868 16.5687 14 15.4641Z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Badge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DualBadge + + + + + + 2.4k + + + + + + 2.4k + + + + + + 2.4k + + + + + + 2.4k + + + + + + + + + + + + + + + + + Stretch + + + + + + + + + + + \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs new file mode 100644 index 0000000..ec1ee5c --- /dev/null +++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Ursa.Demo.Pages; + +public partial class IntroductionDemo : UserControl +{ + public IntroductionDemo() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/demo/Ursa.Demo/ViewModels/ImageViewerDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/ImageViewerDemoViewModel.cs new file mode 100644 index 0000000..9faefee --- /dev/null +++ b/demo/Ursa.Demo/ViewModels/ImageViewerDemoViewModel.cs @@ -0,0 +1,8 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Ursa.Demo.ViewModels; + +public class ImageViewerDemoViewModel: ObservableObject +{ + +} \ No newline at end of file diff --git a/demo/Ursa.Demo/ViewModels/IntroductionDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/IntroductionDemoViewModel.cs new file mode 100644 index 0000000..66ced6d --- /dev/null +++ b/demo/Ursa.Demo/ViewModels/IntroductionDemoViewModel.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.ObjectModel; +using System.Net; +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Ursa.Demo.ViewModels; + +public partial class IntroductionDemoViewModel : ObservableObject +{ + public ObservableCollection MenuItems { get; set; } = new() + { + new MenuItemViewModel() + { + MenuHeader = "任务管理", + MenuIconName = "User", + Children = new ObservableCollection() + { + new() + { + MenuHeader = "公告管理", + MenuIconName = "Star", + Children = new ObservableCollection() + { + new() { MenuHeader = "公告设置" }, + new() { MenuHeader = "公告处理" } + } + }, + new() { MenuHeader = "任务查询" } + } + }, + new MenuItemViewModel() + { + MenuHeader = "附加功能", + IsSeparator = true, + }, + new MenuItemViewModel() + { + MenuHeader = "任务平台", + MenuIconName = "Gear", + Children = new ObservableCollection() + { + new() { MenuHeader = "任务管理" }, + new() { MenuHeader = "用户任务查询" } + } + } + }; + + public ObservableCollection ButtonGroupItems { get; set; } = new() + { + "Avalonia", "WPF", "Xamarin" + }; + + [ObservableProperty] private IPAddress? _address; + + public void ChangeAddress() + { + long l = Random.Shared.NextInt64(0x00000000FFFFFFFF); + Address = new IPAddress(l); + } +} \ No newline at end of file diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs index 8487910..cefd8f3 100644 --- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs +++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs @@ -24,11 +24,13 @@ public class MainViewViewModel : ViewModelBase { Content = s switch { + MenuKeys.MenuKeyIntroduction => new IntroductionDemoViewModel(), MenuKeys.MenuKeyBadge => new BadgeDemoViewModel(), MenuKeys.MenuKeyBanner => new BannerDemoViewModel(), MenuKeys.MenuKeyButtonGroup => new ButtonGroupDemoViewModel(), MenuKeys.MenuKeyDivider => new DividerDemoViewModel(), MenuKeys.MenuKeyDualBadge => new DualBadgeDemoViewModel(), + MenuKeys.MenuKeyImageViewer => new ImageViewerDemoViewModel(), MenuKeys.MenuKeyIpBox => new IPv4BoxDemoViewModel(), MenuKeys.MenuKeyKeyGestureInput => new KeyGestureInputDemoViewModel(), MenuKeys.MenuKeyLoading => new LoadingDemoViewModel(), diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs index f55365f..a091983 100644 --- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs +++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs @@ -10,12 +10,14 @@ public class MenuViewModel: ViewModelBase { MenuItems = new ObservableCollection() { + new() { MenuHeader = "Introduction", Key = MenuKeys.MenuKeyIntroduction, IsSeparator = false }, new() { MenuHeader = "Controls", IsSeparator = true }, new() { MenuHeader = "Badge", Key = MenuKeys.MenuKeyBadge }, new() { MenuHeader = "Banner", Key = MenuKeys.MenuKeyBanner }, new() { MenuHeader = "ButtonGroup", Key = MenuKeys.MenuKeyButtonGroup }, new() { MenuHeader = "Divider", Key = MenuKeys.MenuKeyDivider }, new() { MenuHeader = "DualBadge", Key = MenuKeys.MenuKeyDualBadge }, + new() { MenuHeader = "ImageViewer", Key = MenuKeys.MenuKeyImageViewer }, new() { MenuHeader = "IPv4Box", Key = MenuKeys.MenuKeyIpBox }, new() { MenuHeader = "KeyGestureInput", Key = MenuKeys.MenuKeyKeyGestureInput }, new() { MenuHeader = "Loading", Key = MenuKeys.MenuKeyLoading }, diff --git a/src/Ursa.Themes.Semi/Controls/ImageViewer.axaml b/src/Ursa.Themes.Semi/Controls/ImageViewer.axaml new file mode 100644 index 0000000..485606c --- /dev/null +++ b/src/Ursa.Themes.Semi/Controls/ImageViewer.axaml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml index 2038cd0..c7bf111 100644 --- a/src/Ursa.Themes.Semi/Controls/_index.axaml +++ b/src/Ursa.Themes.Semi/Controls/_index.axaml @@ -6,6 +6,7 @@ + diff --git a/src/Ursa/Controls/ImageViewer/ImageViewer.cs b/src/Ursa/Controls/ImageViewer/ImageViewer.cs new file mode 100644 index 0000000..78a20e7 --- /dev/null +++ b/src/Ursa/Controls/ImageViewer/ImageViewer.cs @@ -0,0 +1,271 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Metadata; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Media.Imaging; + +namespace Ursa.Controls; + +[TemplatePart(PART_Image, typeof(Image))] +[TemplatePart(PART_Layer, typeof(VisualLayerManager))] +[PseudoClasses(PC_Moving)] +public class ImageViewer: TemplatedControl +{ + public const string PART_Image = "PART_Image"; + public const string PART_Layer = "PART_Layer"; + public const string PC_Moving = ":moving"; + + private Image? _image = null!; + private VisualLayerManager? _layer; + private Point? _lastClickPoint; + private Point? _lastLocation; + private bool _moving; + + public static readonly StyledProperty OverlayerProperty = AvaloniaProperty.Register( + nameof(Overlayer)); + + public Control? Overlayer + { + get => GetValue(OverlayerProperty); + set => SetValue(OverlayerProperty, value); + } + + public static readonly StyledProperty SourceProperty = Image.SourceProperty.AddOwner(); + public IImage? Source + { + get => GetValue(SourceProperty); + set => SetValue(SourceProperty, value); + } + + private double _scale = 1; + + public static readonly DirectProperty ScaleProperty = AvaloniaProperty.RegisterDirect( + nameof(Scale), o => o.Scale, (o,v)=> o.Scale = v, unsetValue: 1); + + public double Scale + { + get => _scale; + set => SetAndRaise(ScaleProperty, ref _scale, value); + } + + private double _translateX; + + public static readonly DirectProperty TranslateXProperty = AvaloniaProperty.RegisterDirect( + nameof(TranslateX), o => o.TranslateX, (o,v)=>o.TranslateX = v, unsetValue: 0); + + public double TranslateX + { + get => _translateX; + set => SetAndRaise(TranslateXProperty, ref _translateX, value); + } + + private double _translateY; + + public static readonly DirectProperty TranslateYProperty = + AvaloniaProperty.RegisterDirect( + nameof(TranslateY), o => o.TranslateY, (o, v) => o.TranslateY = v, unsetValue: 0); + + public double TranslateY + { + get => _translateY; + set => SetAndRaise(TranslateYProperty, ref _translateY, value); + } + + public static readonly StyledProperty SmallChangeProperty = AvaloniaProperty.Register( + nameof(SmallChange), defaultValue: 1); + + public double SmallChange + { + get => GetValue(SmallChangeProperty); + set => SetValue(SmallChangeProperty, value); + } + + public static readonly StyledProperty LargeChangeProperty = AvaloniaProperty.Register( + nameof(LargeChange), defaultValue: 10); + + public double LargeChange + { + get => GetValue(LargeChangeProperty); + set => SetValue(LargeChangeProperty, value); + } + + public static readonly StyledProperty StretchProperty = + Image.StretchProperty.AddOwner(new StyledPropertyMetadata(Stretch.Uniform)); + + public Stretch Stretch + { + get => GetValue(StretchProperty); + set => SetValue(StretchProperty, value); + } + + static ImageViewer() + { + FocusableProperty.OverrideDefaultValue(true); + OverlayerProperty.Changed.AddClassHandler((o, e) => o.OnOverlayerChanged(e)); + SourceProperty.Changed.AddClassHandler((o, e) => o.OnSourceChanged(e)); + TranslateXProperty.Changed.AddClassHandler((o,e)=>o.OnTranslateXChanged(e)); + TranslateYProperty.Changed.AddClassHandler((o, e) => o.OnTranslateYChanged(e)); + StretchProperty.Changed.AddClassHandler((o, e) => o.OnStretchChanged(e)); + } + + private void OnTranslateYChanged(AvaloniaPropertyChangedEventArgs args) + { + if (_moving) return; + var newValue = args.GetNewValue(); + if (_lastLocation is not null) + { + _lastLocation = _lastLocation.Value.WithY(newValue); + } + else + { + _lastLocation = new Point(0, newValue); + } + } + + private void OnTranslateXChanged(AvaloniaPropertyChangedEventArgs args) + { + if (_moving) return; + var newValue = args.GetNewValue(); + if (_lastLocation is not null) + { + _lastLocation = _lastLocation.Value.WithX(newValue); + } + else + { + _lastLocation = new Point(newValue, 0); + } + } + + private void OnOverlayerChanged(AvaloniaPropertyChangedEventArgs args) + { + var control = args.GetNewValue(); + if (control is { } c) + { + AdornerLayer.SetAdorner(this, c); + } + } + + private void OnSourceChanged(AvaloniaPropertyChangedEventArgs args) + { + IImage image = args.GetNewValue(); + Size size = image.Size; + double width = this.Bounds.Width; + double height = this.Bounds.Height; + if (_image is not null) + { + _image.Width = size.Width; + _image.Height = size.Height; + } + Scale = GetScaleRatio(width/size.Width, height/size.Height, this.Stretch); + } + + private void OnStretchChanged(AvaloniaPropertyChangedEventArgs args) + { + var stretch = args.GetNewValue(); + Scale = GetScaleRatio(Width / _image!.Width, Height / _image!.Height, stretch); + } + + private double GetScaleRatio(double widthRatio, double heightRatio, Stretch stretch) + { + return stretch switch + { + Stretch.Fill => 1d, + Stretch.None => 1d, + Stretch.Uniform => Math.Min(widthRatio, heightRatio), + Stretch.UniformToFill => Math.Max(widthRatio, heightRatio), + _ => 1d, + }; + } + + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) + { + base.OnApplyTemplate(e); + _image = e.NameScope.Get(PART_Image); + _layer = e.NameScope.Get(PART_Layer); + if (Source is { } i) + { + Size size = i.Size; + double width = Bounds.Width; + double height = Bounds.Height; + _image.Width = size.Width; + _image.Height = size.Height; + Scale = GetScaleRatio(width/size.Width, height/size.Height, this.Stretch); + } + if (Overlayer is { } c) + { + AdornerLayer.SetAdorner(this, c); + } + } + + + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + if(e.Delta.Y > 0) + { + Scale *= 1.1; + } + else + { + var scale = Scale; + scale /= 1.1; + if (scale < 0.1) scale = 0.1; + Scale = scale; + } + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + if (e.Pointer.Captured == this && _lastClickPoint != null) + { + PseudoClasses.Set(PC_Moving, true); + Point p = e.GetPosition(this); + double deltaX = p.X - _lastClickPoint.Value.X; + double deltaY = p.Y - _lastClickPoint.Value.Y; + TranslateX = deltaX + (_lastLocation?.X ?? 0); + TranslateY = deltaY + (_lastLocation?.Y ?? 0); + } + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Pointer.Capture(this); + _lastClickPoint = e.GetPosition(this); + _moving = true; + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Pointer.Capture(null); + _lastLocation = new Point(TranslateX, TranslateY); + PseudoClasses.Set(PC_Moving, false); + _moving = false; + } + + protected override void OnKeyDown(KeyEventArgs e) + { + double step = e.KeyModifiers.HasFlag(KeyModifiers.Control) ? LargeChange : SmallChange; + switch (e.Key) + { + case Key.Left: + TranslateX -= step; + break; + case Key.Right: + TranslateX += step; + break; + case Key.Up: + TranslateY -= step; + break; + case Key.Down: + TranslateY += step; + break; + } + base.OnKeyDown(e); + } +} \ No newline at end of file