2.4.4

2022-12-12 02:34:19 +08:00
parent 5fb5a3b963
commit fd329037e7
39 changed files with 624 additions and 423 deletions
@@ -177,7 +177,7 @@
                 }, "MyButton Scale " & Uuid)
    End Sub
    Private Sub Button_MouseEnter() Handles Me.MouseEnter
-        AniStart(AaColor(PanFore, BackgroundProperty, If(_ColorType = ColorState.Red, "ColorBrushRedBack", "ColorBrush9"), AnimationColorIn), "MyButton Background " & Uuid)
+        AniStart(AaColor(PanFore, BackgroundProperty, If(_ColorType = ColorState.Red, "ColorBrushRedBack", "ColorBrushBg1"), AnimationColorIn), "MyButton Background " & Uuid)
    End Sub
    Private Sub Button_MouseUp() Handles Me.MouseLeftButtonUp
        If Not IsMouseDown Then Exit Sub
@@ -130,7 +130,9 @@
                Case 6
                    Stack.Children.Add(ForgeDownloadListItem(Data, AddressOf ForgeSave_Click, True))
                Case 7
-                    Stack.Children.Add(McDownloadListItem(Data, AddressOf FrmDownloadInstall.MinecraftSelected, False))
+                    Stack.Children.Add(McDownloadListItem(Data, Sub(sender, e) '不能使用 AddressOf，这导致了 #535，原因完全不明，疑似是编译器 Bug
+                                                                    FrmDownloadInstall.MinecraftSelected(sender, e)
+                                                                End Sub, False))
                Case 8
                    Stack.Children.Add(CType(Data, DlCfFile).ToListItem(AddressOf FrmDownloadCfDetail.Save_Click))
                Case 9
@@ -5,7 +5,7 @@
             FocusVisualStyle="{x:Null}"
            MinWidth="20" x:Name="PanBack" UseLayoutRounding="False" SnapsToDevicePixels="False" MinHeight="20" Background="{StaticResource ColorBrushSemiTransparent}" Focusable="True" d:DesignWidth="126.4" d:DesignHeight="44.8">
    <TextBlock IsHitTestVisible="False" FontSize="13" x:Name="LabText" Padding="0" Margin="26,0,0,0" Text="Checkbox" Foreground="{DynamicResource ColorBrush1}" HorizontalAlignment="Left" VerticalAlignment="Center" />
-    <Border IsHitTestVisible="False" x:Name="ShapeBorder" BorderThickness="1.1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="18" Height="18" BorderBrush="{DynamicResource ColorBrush1}" CornerRadius="3" Margin="1,0,0,0" Background="{StaticResource ColorBrushHalfWhite}" />
+    <Border IsHitTestVisible="False" x:Name="ShapeBorder" BorderThickness="1.1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="18" Height="18" BorderBrush="{DynamicResource ColorBrush1}" CornerRadius="3" Margin="1,0,0,0" Background="{StaticResource ColorBrushBg2}" />
    <Path IsHitTestVisible="False" x:Name="ShapeCheck" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{Binding BorderBrush, ElementName=ShapeBorder}" Width="12" Height="12" Margin="4,0,0,0" Data="M0,6L1.5,4.5 4.5,7.5 10.5,1.5 12,3 4.5,10.5 0,6z">
        <Path.RenderTransform>
            <ScaleTransform CenterX="6" CenterY="6" ScaleX="0" ScaleY="0" />
@@ -124,13 +124,13 @@
        Log("[Control] 按下复选框（" & (Not Checked).ToString & "）：" & Text)
        MouseDowned = False
        SetChecked(Not Checked, True, True)
-        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushHalfWhite", 100), "MyCheckBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushBg2", 100), "MyCheckBox Background " & Uuid)
    End Sub
    Private Sub Checkbox_MouseDown() Handles Me.MouseLeftButtonDown
        If Not AllowMouseDown Then Exit Sub
        MouseDowned = True
        Focus()
-        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrush9", 100), "MyCheckBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushBg1", 100), "MyCheckBox Background " & Uuid)
        If Checked Then
            AniStart({
                     AaScale(ShapeBorder, 16.5 - ShapeBorder.Width, 1000, , New AniEaseOutFluent(AniEasePower.Strong), Absolute:=True),
@@ -143,7 +143,7 @@
    Private Sub Checkbox_MouseLeave() Handles Me.MouseLeave
        If Not MouseDowned Then Exit Sub
        MouseDowned = False
-        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushHalfWhite", 100), "MyCheckBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushBg2", 100), "MyCheckBox Background " & Uuid)
        If Checked Then
            AniStart({
                     AaScale(ShapeBorder, 18 - ShapeBorder.Width, 400, , New AniEaseOutFluent(AniEasePower.Strong), Absolute:=True),
@@ -62,44 +62,40 @@
    '指向动画
    Public Sub RefreshColor() Handles Me.IsEnabledChanged, Me.MouseEnter, Me.MouseLeave, Me.PreviewMouseLeftButtonDown, Me.PreviewMouseLeftButtonUp, Me.GotKeyboardFocus
        '判断当前颜色
-        Dim ColorName As String
-        Dim BackName As String
+        Dim ForeColorName As String
+        Dim BackColorName As String
        Dim Time As Integer
        If IsEnabled Then
-            If IsEditable AndAlso Template.FindName("PART_EditableTextBox", Me).IsFocused Then
-                ColorName = "ColorBrush4"
-                BackName = "ColorBrush9"
-                Time = 60
-            ElseIf IsMouseDown OrElse IsDropDownOpen Then
-                ColorName = "ColorBrush3"
-                BackName = "ColorBrush9"
-                Time = 60
+            If IsMouseDown OrElse IsDropDownOpen OrElse (IsEditable AndAlso Template.FindName("PART_EditableTextBox", Me).IsFocused) Then
+                ForeColorName = "ColorBrush3"
+                BackColorName = "ColorBrushSemiWhite"
+                Time = 10
            ElseIf IsMouseOver Then
-                ColorName = "ColorBrush3"
-                BackName = "ColorBrushHalfWhite"
-                Time = 100
+                ForeColorName = "ColorBrush4"
+                BackColorName = "ColorBrush7"
+                Time = 50
            Else
-                ColorName = "ColorBrush1"
-                BackName = "ColorBrushHalfWhite"
-                Time = 200
+                ForeColorName = "ColorBrushBg0"
+                BackColorName = "ColorBrushBg2"
+                Time = 50
            End If
        Else
-            ColorName = "ColorBrushGray4"
-            BackName = "ColorBrushHalfWhite"
+            ForeColorName = "ColorBrushGray5"
+            BackColorName = "ColorBrushGray6"
            Time = 200
        End If
        '触发颜色动画
        If IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
            '有动画
            AniStart({
-                     AaColor(Me, ForegroundProperty, ColorName, Time),
-                     AaColor(Me, BackgroundProperty, BackName, Time)
+                     AaColor(Me, ForegroundProperty, ForeColorName, Time),
+                     AaColor(Me, BackgroundProperty, BackColorName, Time)
                 }, "MyComboBox Color " & Uuid)
        Else
            '无动画
            AniStop("MyComboBox Color " & Uuid)
-            SetResourceReference(ForegroundProperty, ColorName)
-            SetResourceReference(BackgroundProperty, BackName)
+            SetResourceReference(ForegroundProperty, ForeColorName)
+            SetResourceReference(BackgroundProperty, BackColorName)
        End If
    End Sub

@@ -507,27 +507,26 @@

    '触发点击事件
    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.PreviewMouseLeftButtonUp
-        If IsMouseDown Then
-            RaiseEvent Click(sender, e)
-            If e.Handled Then Exit Sub
-            '触发自定义事件
-            If Not String.IsNullOrEmpty(EventType) Then
-                ModEvent.TryStartEvent(EventType, EventData)
-                e.Handled = True
-            End If
-            If e.Handled Then Exit Sub
-            '实际的单击处理
-            Select Case Type
-                Case CheckType.Clickable
-                    Log("[Control] 按下单击列表项：" & Title)
-                Case CheckType.RadioBox
-                    Log("[Control] 按下单选列表项：" & Title)
-                    If Not Checked Then SetChecked(True, True, True)
-                Case CheckType.CheckBox
-                    Log("[Control] 按下复选列表项（" & (Not Checked).ToString & "）：" & Title)
-                    SetChecked(Not Checked, True, True)
-            End Select
+        If Not IsMouseDown Then Exit Sub
+        RaiseEvent Click(sender, e)
+        If e.Handled Then Exit Sub
+        '触发自定义事件
+        If Not String.IsNullOrEmpty(EventType) Then
+            ModEvent.TryStartEvent(EventType, EventData)
+            e.Handled = True
        End If
+        If e.Handled Then Exit Sub
+        '实际的单击处理
+        Select Case Type
+            Case CheckType.Clickable
+                Log("[Control] 按下单击列表项：" & Title)
+            Case CheckType.RadioBox
+                Log("[Control] 按下单选列表项：" & Title)
+                If Not Checked Then SetChecked(True, True, True)
+            Case CheckType.CheckBox
+                Log("[Control] 按下复选列表项（" & (Not Checked).ToString & "）：" & Title)
+                SetChecked(Not Checked, True, True)
+        End Select
        'AniStart({
        '       AaScaleTransform(Me, 1.004 - CType(RenderTransform, ScaleTransform).ScaleX, 150,, New AniEaseOutFluent),
        '       AaScaleTransform(Me, -0.004, 100, 150, New AniEaseInFluent)
@@ -603,7 +602,7 @@
            If IsMouseOver AndAlso IsMouseOverAnimationEnabled Then
                If ButtonStack IsNot Nothing Then Ani.Add(AaOpacity(ButtonStack, 1 - ButtonStack.Opacity, Time * 0.7, Time * 0.3))
                Ani.AddRange({
-                             AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrush9"), Time),
+                             AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrushBg1"), Time),
                             AaOpacity(RectBack, 1 - RectBack.Opacity, Time,, New AniEaseOutFluent)
                         })
                If IsScaleAnimationEnabled Then
@@ -630,7 +629,7 @@
            If IsMouseOver AndAlso IsMouseOverAnimationEnabled Then
                If ButtonStack IsNot Nothing Then ButtonStack.Opacity = 1
                '由于鼠标已经移入，所以直接实例化 RectBack
-                RectBack.Background = Color9
+                RectBack.Background = ColorBg1
                RectBack.Opacity = 1
                RectBack.RenderTransform = New ScaleTransform(1, 1)
                Me.RenderTransform = New ScaleTransform(1, 1)
@@ -3,7 +3,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             FocusVisualStyle="{x:Null}"
             MinWidth="20" x:Name="PanBack" UseLayoutRounding="False" SnapsToDevicePixels="False" MinHeight="20" Background="{StaticResource ColorBrushSemiTransparent}" Focusable="True">
-        <TextBlock IsHitTestVisible="False" x:Name="LabText" FontSize="13" Padding="0" Margin="26,0,0,0" Text="Radiobox" Foreground="{DynamicResource ColorBrush1}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-    <Ellipse IsHitTestVisible="False" x:Name="ShapeBorder" StrokeThickness="1.1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="18" Height="18" Stroke="{DynamicResource ColorBrush1}" Margin="1,0,0,0" Fill="{StaticResource ColorBrushHalfWhite}" />
-        <Ellipse IsHitTestVisible="False" x:Name="ShapeDot" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{Binding Stroke, ElementName=ShapeBorder}" Width="0" Height="0" Margin="10,0,0,0" StrokeThickness="0" />
+    <TextBlock IsHitTestVisible="False" x:Name="LabText" FontSize="13" Padding="0" Margin="26,0,0,0" Text="Radiobox" Foreground="{DynamicResource ColorBrush1}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+    <Ellipse IsHitTestVisible="False" x:Name="ShapeBorder" StrokeThickness="1.1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="18" Height="18" Stroke="{DynamicResource ColorBrush1}" Margin="1,0,0,0" Fill="{StaticResource ColorBrushBg2}" />
+    <Ellipse IsHitTestVisible="False" x:Name="ShapeDot" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{Binding Stroke, ElementName=ShapeBorder}" Width="0" Height="0" Margin="10,0,0,0" StrokeThickness="0" />
 </Grid>
@@ -170,12 +170,12 @@
        MouseDowned = False
        Log("[Control] 按下单选框：" & Text)
        SetChecked(True, True, True)
-        AniStart(AaColor(ShapeBorder, Shapes.Ellipse.FillProperty, "ColorBrushHalfWhite", 100), "MyRadioBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Ellipse.FillProperty, "ColorBrushBg2", 100), "MyRadioBox Background " & Uuid)
    End Sub
    Private Sub Radiobox_MouseDown() Handles Me.MouseLeftButtonDown
        MouseDowned = True
        Focus()
-        AniStart(AaColor(ShapeBorder, Shapes.Ellipse.FillProperty, "ColorBrush9", 100), "MyRadioBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Ellipse.FillProperty, "ColorBrushBg1", 100), "MyRadioBox Background " & Uuid)
        If Not Checked Then
            AniStart(AaScale(ShapeBorder, 16.5 - ShapeBorder.Width, 1000, , New AniEaseOutFluent(AniEasePower.Strong), Absolute:=True), "MyRadioBox Border " & Uuid)
        End If
@@ -183,7 +183,7 @@
    Private Sub Radiobox_MouseLeave() Handles Me.MouseLeave
        If Not MouseDowned Then Exit Sub
        MouseDowned = False
-        AniStart(AaColor(ShapeBorder, Shapes.Ellipse.FillProperty, "ColorBrushHalfWhite", 100), "MyRadioBox Background " & Uuid)
+        AniStart(AaColor(ShapeBorder, Ellipse.FillProperty, "ColorBrushBg2", 100), "MyRadioBox Background " & Uuid)
        If Not Checked Then
            AniStart(AaScale(ShapeBorder, 18 - ShapeBorder.Width, 400, , New AniEaseOutFluent(AniEasePower.Strong), Absolute:=True), "MyRadioBox Border " & Uuid)
        End If
@@ -6,11 +6,13 @@
             mc:Ignorable="d" 
             d:DesignHeight="16" d:DesignWidth="162" 
             FocusVisualStyle="{x:Null}"
-             MinHeight="16" UseLayoutRounding="False" SnapsToDevicePixels="False" BorderBrush="{DynamicResource ColorBrush1}" Name="PanBack" Background="{StaticResource ColorBrushSemiTransparent}" Focusable="True">
+             MinHeight="16" UseLayoutRounding="False" SnapsToDevicePixels="False" BorderBrush="{DynamicResource ColorBrush4}" Name="PanBack" Background="{StaticResource ColorBrushSemiTransparent}" Focusable="True">
    <Grid x:Name="PanMain" MinHeight="16" MaxHeight="16" IsHitTestVisible="False">
-        <Line Height="4" Name="LineBack" Stroke="{StaticResource ColorBrushGray5}" StrokeThickness="1.1" X2="10000" Y1="2" Y2="2" HorizontalAlignment="Right" Width="0" SnapsToDevicePixels="True" Margin="0,0,1,0" />
-        <Line Height="4" Name="LineFore" Stroke="{Binding ElementName=PanBack, Path=BorderBrush}" StrokeThickness="1.1" X2="10000" Y1="2" Y2="2" Width="0" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1,0,0,0" />
-        <Ellipse HorizontalAlignment="Left" Width="16" Stroke="{Binding BorderBrush, ElementName=PanBack}" StrokeThickness="1.1" Fill="{StaticResource ColorBrushHalfWhite}" Name="ShapeDot" Height="16" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+        <Line Height="4" Name="LineBack" Stroke="{DynamicResource ColorBrushBg0}" Opacity="0.3" StrokeThickness="1.6" X2="10000" Y1="2" Y2="2" HorizontalAlignment="Right" Width="0" SnapsToDevicePixels="True" Margin="0,0,1,0" />
+        <Line Height="4" Name="LineFore" Stroke="{Binding ElementName=PanBack, Path=BorderBrush}" StrokeThickness="1.6" X2="10000" Y1="2" Y2="2" Width="0" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1,0,0,0" />
+        <Ellipse HorizontalAlignment="Left" Width="10" Height="10" 
+                 Stroke="{Binding BorderBrush, ElementName=PanBack}" StrokeThickness="1.2" 
+                 Fill="{DynamicResource ColorBrush4}" Name="ShapeDot" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
            <Ellipse.RenderTransform>
                <ScaleTransform />
            </Ellipse.RenderTransform>
@@ -45,13 +45,13 @@
                End If

                If IsLoaded AndAlso AniControlEnabled = 0 Then
-                    If ActualWidth < 16 Then Exit Property
-                    Dim NewWidth As Double = _Value / MaxValue * (ActualWidth - 16)
-                    Dim DeltaProcess As Double = Math.Abs(LineFore.Width / (ActualWidth - 16) - _Value / MaxValue)
+                    If ActualWidth < ShapeDot.Width Then Exit Property
+                    Dim NewWidth As Double = _Value / MaxValue * (ActualWidth - ShapeDot.Width)
+                    Dim DeltaProcess As Double = Math.Abs(LineFore.Width / (ActualWidth - ShapeDot.Width) - _Value / MaxValue)
                    Dim Time As Double = (1 - Math.Pow(1 - DeltaProcess, 3)) * 300 + If(ChangeByKey, 100, 0)
                    AniStart({
                            AaWidth(LineFore, Math.Max(0, NewWidth + If(NewWidth < 0.5, 0, 0.5)) - LineFore.Width, Time,, If(Time > 50, New AniEaseOutFluent, New AniEaseLinear)),
-                            AaWidth(LineBack, Math.Max(0, ActualWidth - 16 - NewWidth + If(ActualWidth - 16 - NewWidth < 0.5, 0, 0.5)) - LineBack.Width, Time,, If(Time > 50, New AniEaseOutFluent, New AniEaseLinear)),
+                            AaWidth(LineBack, Math.Max(0, ActualWidth - ShapeDot.Width - NewWidth + If(ActualWidth - ShapeDot.Width - NewWidth < 0.5, 0, 0.5)) - LineBack.Width, Time,, If(Time > 50, New AniEaseOutFluent, New AniEaseLinear)),
                            AaX(ShapeDot, NewWidth - ShapeDot.Margin.Left, Time,, If(Time > 50, New AniEaseOutFluent, New AniEaseLinear))
                         }, "MySlider Progress " & Uuid)
                Else
@@ -67,9 +67,9 @@
    Private Sub RefreshWidth(sender As Object, e As SizeChangedEventArgs) Handles Me.SizeChanged
        If Not IsNothing(e) Then PanMain.Width = e.NewSize.Width
        AniStop("MySlider Progress " & Uuid)
-        Dim NewWidth As Double = _Value / MaxValue * (ActualWidth - 16)
+        Dim NewWidth As Double = _Value / MaxValue * (ActualWidth - ShapeDot.Width)
        LineFore.Width = Math.Max(0, NewWidth + If(NewWidth < 0.5, 0, 0.5))
-        LineBack.Width = Math.Max(0, ActualWidth - 16 - NewWidth + If(ActualWidth - 16 - NewWidth < 0.5, 0, 0.5))
+        LineBack.Width = Math.Max(0, ActualWidth - ShapeDot.Width - NewWidth + If(ActualWidth - ShapeDot.Width - NewWidth < 0.5, 0, 0.5))
        SetLeft(ShapeDot, NewWidth)
    End Sub

@@ -79,9 +79,10 @@
    Private Sub DragStart(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonDown
        e.Handled = True '防止 ScrollViewer 失焦问题
        DragControl = Me
+        RefreshColor()
        FrmMain.DragDoing()
        AniStart({
-                 AaScaleTransform(ShapeDot, 0.8 - CType(ShapeDot.RenderTransform, ScaleTransform).ScaleX, 75,, New AniEaseOutFluent)
+                 AaScaleTransform(ShapeDot, 1.3 - CType(ShapeDot.RenderTransform, ScaleTransform).ScaleX, 40,, New AniEaseOutFluent)
            }, "MySlider Scale " & Uuid)
        '更新 Popup
        If GetHintText IsNot Nothing Then
@@ -91,7 +92,7 @@
        End If
    End Sub
    Public Sub DragDoing()
-        Dim Percent As Double = MathRange((Mouse.GetPosition(PanMain).X - 8) / (ActualWidth - 16), 0, 1)
+        Dim Percent As Double = MathRange((Mouse.GetPosition(PanMain).X - ShapeDot.Width / 2) / (ActualWidth - ShapeDot.Width), 0, 1)
        Dim NewValue As Integer = Percent * MaxValue
        If Not NewValue = Value Then
            Value = NewValue
@@ -113,28 +114,39 @@
        Try

            '判断当前颜色
-            Dim ColorName As String
+            Dim ForegroundName As String, DotFillName As String
            Dim AnimationTime As Integer
            If IsEnabled Then
-                If IsMouseOver OrElse (Not IsNothing(DragControl) AndAlso DragControl.Equals(Me)) Then
-                    ColorName = "ColorBrush3"
-                    AnimationTime = 100
+                If Not IsNothing(DragControl) AndAlso DragControl.Equals(Me) Then
+                    ForegroundName = "ColorBrush3"
+                    DotFillName = "ColorBrush3"
+                    AnimationTime = 40
+                ElseIf IsMouseOver Then
+                    ForegroundName = "ColorBrush3"
+                    DotFillName = "ColorBrush3"
+                    AnimationTime = 40
                Else
-                    ColorName = "ColorBrush1"
-                    AnimationTime = 200
+                    ForegroundName = "ColorBrush4"
+                    DotFillName = "ColorBrush4"
+                    AnimationTime = 100
                End If
            Else
-                ColorName = "ColorBrushGray4"
+                ForegroundName = "ColorBrushGray5"
+                DotFillName = "ColorBrushGray5"
                AnimationTime = 200
            End If
            '触发颜色动画
            If IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
                '有动画
-                AniStart({AaColor(Me, BorderBrushProperty, ColorName, AnimationTime)}, "MySlider Color " & Uuid)
+                AniStart({
+                            AaColor(Me, BorderBrushProperty, ForegroundName, AnimationTime),
+                            AaColor(ShapeDot, Ellipse.FillProperty, DotFillName, AnimationTime)
+                         }, "MySlider Color " & Uuid)
            Else
                '无动画
                AniStop("MySlider Color " & Uuid)
-                SetResourceReference(BorderBrushProperty, ColorName)
+                SetResourceReference(BorderBrushProperty, ForegroundName)
+                ShapeDot.SetResourceReference(Ellipse.FillProperty, DotFillName)
            End If

        Catch ex As Exception
@@ -212,35 +212,26 @@
            If IsEnabled Then
                If ValidateResult = "" OrElse Not IsTextChanged Then
                    If IsFocused Then
-                        ForeColorName = "ColorBrush4"
-                        BackColorName = "ColorBrush9"
-                        AnimationTime = 60
-                    ElseIf IsMouseOver Then
                        ForeColorName = "ColorBrush3"
-                        BackColorName = "ColorBrushHalfWhite"
-                        AnimationTime = 100
-                    Else
-                        ForeColorName = "ColorBrush1"
-                        BackColorName = "ColorBrushHalfWhite"
-                        AnimationTime = 200
+                        BackColorName = "ColorBrushSemiWhite"
+                        AnimationTime = 10
+                    ElseIf IsMouseOver Then
+                        ForeColorName = "ColorBrush4"
+                        BackColorName = "ColorBrush7"
+                        AnimationTime = 50
+                    Else '未选中
+                        ForeColorName = "ColorBrushBg0"
+                        BackColorName = "ColorBrushBg2"
+                        AnimationTime = 50
                    End If
                Else
                    ForeColorName = "ColorBrushRedLight"
                    BackColorName = "ColorBrushRedBack"
                    AnimationTime = 200
-                    'If IsFocused OrElse IsMouseOver Then
-                    '    ForeColorName = "ColorBrushRedLight"
-                    '    BackColorName = "ColorBrushRedBack"
-                    '    AnimationTime = 100
-                    'Else
-                    '    ForeColorName = "ColorBrushRedDark"
-                    '    BackColorName = "ColorBrushHalfWhite"
-                    '    AnimationTime = 200
-                    'End If
                End If
            Else
-                ForeColorName = "ColorBrushGray4"
-                BackColorName = "ColorBrushHalfWhite"
+                ForeColorName = "ColorBrushGray5"
+                BackColorName = "ColorBrushGray6"
                AnimationTime = 200
            End If
            '触发颜色动画