From 6a21aec1dc5e77600524cdaa5d1d9b3a8001719a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:20:33 +0800
Subject: [PATCH] misc: rename & remove.

---
 demo/Ursa.Demo/Pages/RatingDemo.axaml            | 13 -------------
 demo/Ursa.Demo/ViewModels/MenuViewModel.cs       |  2 +-
 demo/Ursa.Demo/ViewModels/RatingDemoViewModel.cs |  9 +--------
 src/Ursa.Themes.Semi/Controls/Rating.axaml       |  4 ++--
 src/Ursa/Controls/Rating/Rating.cs               | 13 -------------
 src/Ursa/Controls/Rating/RatingCharacter.cs      |  8 ++++----
 6 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/RatingDemo.axaml b/demo/Ursa.Demo/Pages/RatingDemo.axaml
index 770b251..89ab51f 100644
--- a/demo/Ursa.Demo/Pages/RatingDemo.axaml
+++ b/demo/Ursa.Demo/Pages/RatingDemo.axaml
@@ -22,7 +22,6 @@
                     <u:Rating
                         AllowClear="{Binding AllowClear}"
                         AllowHalf="{Binding AllowHalf}"
-                        AllowFocus="{Binding AllowFocus}"
                         IsEnabled="{Binding IsEnabled}"
                         Value="{Binding Value}"
                         Count="{Binding Count}"
@@ -31,7 +30,6 @@
                         Classes="Small"
                         AllowClear="{Binding AllowClear}"
                         AllowHalf="{Binding AllowHalf}"
-                        AllowFocus="{Binding AllowFocus}"
                         IsEnabled="{Binding IsEnabled}"
                         Value="{Binding Value}"
                         Count="{Binding Count}"
@@ -40,7 +38,6 @@
                         Size="48"
                         AllowClear="{Binding AllowClear}"
                         AllowHalf="{Binding AllowHalf}"
-                        AllowFocus="{Binding AllowFocus}"
                         IsEnabled="{Binding IsEnabled}"
                         Value="{Binding Value}"
                         Count="{Binding Count}"
@@ -71,16 +68,6 @@
                         Grid.Column="1"
                         VerticalAlignment="Center"
                         IsChecked="{Binding AllowHalf}" />
-                    <Label
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="AllowFocus" />
-                    <ToggleSwitch
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        VerticalAlignment="Center"
-                        IsChecked="{Binding AllowFocus}" />
                     <Label
                         Grid.Row="3"
                         Grid.Column="0"
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index ffd9908..a6c1b79 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -38,7 +38,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad },
             new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
             new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
-            new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating },
+            new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating, Status = "New"},
             new() { MenuHeader = "Scroll To", Key = MenuKeys.MenuKeyScrollToButton },
             new() { MenuHeader = "Selection List", Key = MenuKeys.MenuKeySelectionList },
             new() { MenuHeader = "Skeleton", Key = MenuKeys.MenuKeySkeleton },
diff --git a/demo/Ursa.Demo/ViewModels/RatingDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/RatingDemoViewModel.cs
index e64141b..6028660 100644
--- a/demo/Ursa.Demo/ViewModels/RatingDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/RatingDemoViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Ursa.Demo.ViewModels;
 
@@ -7,14 +6,8 @@ public partial class RatingDemoViewModel : ViewModelBase
 {
     [ObservableProperty] private bool _allowClear = true;
     [ObservableProperty] private bool _allowHalf = true;
-    [ObservableProperty] private bool _allowFocus;
     [ObservableProperty] private bool _isEnabled = true;
-
     [ObservableProperty] private double _value;
-
     [ObservableProperty] private double _defaultValue = 2.3;
     [ObservableProperty] private int _count = 5;
-    // [ObservableProperty] private object _character;
-
-    public ObservableCollection<string> Tooltips { get; set; } = ["1", "2", "3", "4", "5"];
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Rating.axaml b/src/Ursa.Themes.Semi/Controls/Rating.axaml
index 40cdf56..6a91411 100644
--- a/src/Ursa.Themes.Semi/Controls/Rating.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Rating.axaml
@@ -17,7 +17,7 @@
                           Stretch="Uniform"
                           Data="{TemplateBinding Character}"
                           Fill="{TemplateBinding Background}" />
-                    <Border Name="{x:Static u:RatingCharacter.PART_IconGlyph}"
+                    <Border Name="{x:Static u:RatingCharacter.PART_IconBorder}"
                             IsVisible="False"
                             ClipToBounds="True">
                         <Path Width="{Binding #PART_Root.Width}"
@@ -33,7 +33,7 @@
         <Style Selector="^:pointerover">
             <Setter Property="RenderTransform" Value="scale(1.1)" />
         </Style>
-        <Style Selector="^:selected /template/ Border#PART_IconGlyph">
+        <Style Selector="^:selected /template/ Border#PART_IconBorder">
             <Setter Property="IsVisible" Value="True" />
         </Style>
     </ControlTheme>
diff --git a/src/Ursa/Controls/Rating/Rating.cs b/src/Ursa/Controls/Rating/Rating.cs
index 494ab10..f294c94 100644
--- a/src/Ursa/Controls/Rating/Rating.cs
+++ b/src/Ursa/Controls/Rating/Rating.cs
@@ -15,8 +15,6 @@ public class Rating : TemplatedControl
     public const string PART_ItemsControl = "PART_ItemsControl";
     protected const string PC_Selected = ":selected";
 
-    private ItemsControl? _itemsControl;
-
     public static readonly StyledProperty<double> ValueProperty =
         AvaloniaProperty.Register<Rating, double>(nameof(Value), defaultBindingMode: BindingMode.TwoWay);
 
@@ -26,9 +24,6 @@ public class Rating : TemplatedControl
     public static readonly StyledProperty<bool> AllowHalfProperty =
         AvaloniaProperty.Register<Rating, bool>(nameof(AllowHalf));
 
-    public static readonly StyledProperty<bool> AllowFocusProperty =
-        AvaloniaProperty.Register<Rating, bool>(nameof(AllowFocus));
-
     public static readonly StyledProperty<object> CharacterProperty =
         AvaloniaProperty.Register<Rating, object>(nameof(Character));
 
@@ -62,12 +57,6 @@ public class Rating : TemplatedControl
         set => SetValue(AllowHalfProperty, value);
     }
 
-    public bool AllowFocus
-    {
-        get => GetValue(AllowFocusProperty);
-        set => SetValue(AllowFocusProperty, value);
-    }
-
     public object Character
     {
         get => GetValue(CharacterProperty);
@@ -177,8 +166,6 @@ public class Rating : TemplatedControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-
-        _itemsControl = e.NameScope.Find<ItemsControl>(PART_ItemsControl);
         for (var i = 0; i < Count; i++)
         {
             Items.Add(new RatingCharacter
diff --git a/src/Ursa/Controls/Rating/RatingCharacter.cs b/src/Ursa/Controls/Rating/RatingCharacter.cs
index 08f5034..c3623cf 100644
--- a/src/Ursa/Controls/Rating/RatingCharacter.cs
+++ b/src/Ursa/Controls/Rating/RatingCharacter.cs
@@ -9,13 +9,13 @@ using Avalonia.LogicalTree;
 namespace Ursa.Controls;
 
 [PseudoClasses(PC_Selected)]
-[TemplatePart(PART_IconGlyph, typeof(Control))]
+[TemplatePart(PART_IconBorder, typeof(Border))]
 public class RatingCharacter : TemplatedControl
 {
-    public const string PART_IconGlyph = "PART_IconGlyph";
+    public const string PART_IconBorder = "PART_IconBorder";
     protected const string PC_Selected = ":selected";
 
-    private Control? _icon;
+    private Border? _icon;
 
     public static readonly StyledProperty<bool> AllowHalfProperty =
         Rating.AllowHalfProperty.AddOwner<RatingCharacter>();
@@ -71,7 +71,7 @@ public class RatingCharacter : TemplatedControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        _icon = e.NameScope.Find<Control>(PART_IconGlyph);
+        _icon = e.NameScope.Find<Border>(PART_IconBorder);
     }
 
     protected override void OnPointerEntered(PointerEventArgs e)