2.6.4

2023-07-18 04:45:38 +08:00
parent 9c41a807c3
commit e6c6975047
41 changed files with 2616 additions and 1320 deletions
@@ -134,23 +134,21 @@

    '实现自定义事件
    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
-        If IsMouseDown Then
-            Log("[Control] 按下按钮：" & Text)
-            RaiseEvent Click(sender, e)
-            If Not String.IsNullOrEmpty(Tag) Then
-                If Tag.ToString.StartsWith("链接-") OrElse Tag.ToString.StartsWith("启动-") Then
-                    Hint("主页自定义按钮语法已更新，且不再兼容老版本语法，请查看新的自定义示例！")
-                End If
+        If Not IsMouseDown Then Exit Sub
+        Log("[Control] 按下按钮：" & Text)
+        RaiseEvent Click(sender, e)
+        If Not String.IsNullOrEmpty(Tag) Then
+            If Tag.ToString.StartsWith("链接-") OrElse Tag.ToString.StartsWith("启动-") Then
+                Hint("主页自定义按钮语法已更新，且不再兼容老版本语法，请查看新的自定义示例！")
            End If
-            ModEvent.TryStartEvent(EventType, EventData)
        End If
+        ModEvent.TryStartEvent(EventType, EventData)
    End Sub
    Public Property EventType As String
        Get
            Return GetValue(EventTypeProperty)
        End Get
-
-        Set(ByVal value As String)
+        Set(value As String)
            SetValue(EventTypeProperty, value)
        End Set
    End Property
@@ -159,8 +157,7 @@
        Get
            Return GetValue(EventDataProperty)
        End Get
-
-        Set(ByVal value As String)
+        Set(value As String)
            SetValue(EventDataProperty, value)
        End Set
    End Property
@@ -166,7 +166,9 @@
    End Sub

    '事件
+    Public Property HasMouseAnimation As Boolean = True
    Private Sub MyCard_MouseEnter(sender As Object, e As MouseEventArgs) Handles Me.MouseEnter
+        If Not HasMouseAnimation Then Exit Sub
        Dim AniList As New List(Of AniData)
        If Not IsNothing(MainTextBlock) Then AniList.Add(AaColor(MainTextBlock, TextBlock.ForegroundProperty, "ColorBrush2", 150))
        If Not IsNothing(MainSwap) Then AniList.Add(AaColor(MainSwap, Shapes.Path.FillProperty, "ColorBrush2", 150))
@@ -178,6 +180,7 @@
        AniStart(AniList, "MyCard Mouse " & Uuid)
    End Sub
    Private Sub MyCard_MouseLeave(sender As Object, e As MouseEventArgs) Handles Me.MouseLeave
+        If Not HasMouseAnimation Then Exit Sub
        Dim AniList As New List(Of AniData)
        If Not IsNothing(MainTextBlock) Then AniList.Add(AaColor(MainTextBlock, TextBlock.ForegroundProperty, "ColorBrush1", 250))
        If Not IsNothing(MainSwap) Then AniList.Add(AaColor(MainSwap, Shapes.Path.FillProperty, "ColorBrush1", 250))
@@ -102,7 +102,7 @@
        Get
            Return _CanRightClick
        End Get
-        Set(ByVal value As Boolean)
+        Set(value As Boolean)
            _CanRightClick = value
        End Set
    End Property
@@ -34,7 +34,7 @@
        Get
            Return LabText.Text
        End Get
-        Set(ByVal value As String)
+        Set(value As String)
            LabText.Text = value
        End Set
    End Property
@@ -43,7 +43,7 @@
        Get
            Return BtnClose.Visibility = Visibility.Visible
        End Get
-        Set(ByVal value As Boolean)
+        Set(value As Boolean)
            BtnClose.Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
        End Set
    End Property
@@ -0,0 +1,9 @@
+<Border x:Name="PanBack" x:Class="MyIconTextButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource ColorBrushSemiTransparent}" CornerRadius="13.5" MinHeight="27" MaxHeight="27">
+    <StackPanel Orientation="Horizontal">
+        <Path x:Name="ShapeLogo" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" Margin="12,0,0,0" Stretch="Uniform" Fill="White" MaxHeight="16" MaxWidth="16" VerticalAlignment="Center" />
+        <TextBlock x:Name="LabText" VerticalAlignment="Center" Grid.Column="1" Foreground="White" Margin="7,0,12,1" Grid.ColumnSpan="2" SnapsToDevicePixels="False" UseLayoutRounding="False" />
+    </StackPanel>
+</Border>
@@ -0,0 +1,180 @@
+Public Class MyIconTextButton
+
+    '基础
+
+    Public Uuid As Integer = GetUuid()
+    Public Event Check(sender As Object, raiseByMouse As Boolean)
+    Public Event Change(sender As Object, raiseByMouse As Boolean)
+    Public Sub RaiseChange()
+        RaiseEvent Change(Me, False)
+    End Sub '使外部程序可以引发本控件的 Change 事件
+
+    '自定义属性
+
+    Public Property Logo As String
+        Get
+            Return ShapeLogo.Data.ToString
+        End Get
+        Set(value As String)
+            ShapeLogo.Data = (New GeometryConverter).ConvertFromString(value)
+        End Set
+    End Property
+    Private _LogoScale As Double = 1
+    Public Property LogoScale() As Double
+        Get
+            Return _LogoScale
+        End Get
+        Set(value As Double)
+            _LogoScale = value
+            If Not IsNothing(ShapeLogo) Then ShapeLogo.RenderTransform = New ScaleTransform With {.ScaleX = LogoScale, .ScaleY = LogoScale}
+        End Set
+    End Property
+
+    Public Property Text As String
+        Get
+            Return GetValue(TextProperty)
+        End Get
+        Set(value As String)
+            SetValue(TextProperty, value)
+        End Set
+    End Property '内容
+    Public Shared ReadOnly TextProperty As DependencyProperty = DependencyProperty.Register("Text", GetType(String), GetType(MyIconTextButton), New PropertyMetadata(New PropertyChangedCallback(
+                                                                                                                                                               Sub(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
+                                                                                                                                                                   If Not IsNothing(sender) Then CType(sender, MyIconTextButton).LabText.Text = e.NewValue
+                                                                                                                                                               End Sub)))
+    Public Enum ColorState
+        Black
+        Highlight
+    End Enum
+    Private _ColorType As ColorState = ColorState.Black
+    Public Property ColorType As ColorState
+        Get
+            Return _ColorType
+        End Get
+        Set(value As ColorState)
+            _ColorType = value
+            RefreshColor()
+        End Set
+    End Property '颜色类别
+
+    '点击事件
+
+    Public Event Click(sender As Object, e As RouteEventArgs)
+    Private IsMouseDown As Boolean = False
+    Private Sub MyIconTextButton_MouseUp() Handles Me.MouseLeftButtonUp
+        If Not IsMouseDown Then Exit Sub
+        Log("[Control] 按下带图标按钮：" & Text)
+        IsMouseDown = False
+        RaiseEvent Click(Me, New RouteEventArgs(True))
+        ModEvent.TryStartEvent(EventType, EventData)
+        RefreshColor()
+    End Sub
+    Private Sub MyIconTextButton_MouseDown() Handles Me.MouseLeftButtonDown
+        IsMouseDown = True
+        RefreshColor()
+    End Sub
+    Public Property EventType As String
+        Get
+            Return GetValue(EventTypeProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventTypeProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventTypeProperty As DependencyProperty = DependencyProperty.Register("EventType", GetType(String), GetType(MyIconTextButton), New PropertyMetadata(Nothing))
+    Public Property EventData As String
+        Get
+            Return GetValue(EventDataProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventDataProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventDataProperty As DependencyProperty = DependencyProperty.Register("EventData", GetType(String), GetType(MyIconTextButton), New PropertyMetadata(Nothing))
+
+    '动画
+
+    Private Const AnimationTimeOfMouseIn As Integer = 100 '鼠标指向动画长度
+    Private Const AnimationTimeOfMouseOut As Integer = 150 '鼠标移出动画长度
+    Private Sub RefreshColor(Optional obj = Nothing, Optional e = Nothing) Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded, Me.IsEnabledChanged
+        Try
+            If IsLoaded AndAlso AniControlEnabled = 0 AndAlso Not False.Equals(e) Then '防止默认属性变更触发动画，若强制不执行动画，则 e 为 False
+
+                Select Case ColorType
+                    Case ColorState.Black
+                        If IsMouseDown Then
+                            '按下
+                            AniStart(AaColor(Me, BackgroundProperty, "ColorBrush6", 70), "MyIconTextButton Color " & Uuid)
+                        ElseIf IsMouseOver Then
+                            '指向
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrush3", AnimationTimeOfMouseIn),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrush3", AnimationTimeOfMouseIn)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, "ColorBrushBg1", AnimationTimeOfMouseIn), "MyIconTextButton Color " & Uuid)
+                        ElseIf IsEnabled Then
+                            '正常
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrush1", AnimationTimeOfMouseOut),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrush1", AnimationTimeOfMouseOut)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, ColorSemiTransparent - Background, AnimationTimeOfMouseOut), "MyIconTextButton Color " & Uuid)
+                        Else
+                            '禁用
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrushGray5", 100),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrushGray5", 100)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, ColorSemiTransparent - Background, AnimationTimeOfMouseOut), "MyIconTextButton Color " & Uuid)
+                        End If
+                    Case ColorState.Highlight
+                        If IsMouseDown Then
+                            '按下
+                            AniStart(AaColor(Me, BackgroundProperty, "ColorBrush6", 70), "MyIconTextButton Color " & Uuid)
+                        ElseIf IsMouseOver Then
+                            '指向
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrush3", AnimationTimeOfMouseIn),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrush3", AnimationTimeOfMouseIn)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, "ColorBrushBg1", AnimationTimeOfMouseIn), "MyIconTextButton Color " & Uuid)
+                        ElseIf IsEnabled Then
+                            '正常
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrush3", AnimationTimeOfMouseOut),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrush3", AnimationTimeOfMouseOut)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, ColorSemiTransparent - Background, AnimationTimeOfMouseOut), "MyIconTextButton Color " & Uuid)
+                        Else
+                            '禁用
+                            AniStart({
+                                AaColor(ShapeLogo, Shapes.Path.FillProperty, "ColorBrushGray5", 100),
+                                AaColor(LabText, TextBlock.ForegroundProperty, "ColorBrushGray5", 100)
+                            }, "MyIconTextButton Checked " & Uuid)
+                            AniStart(AaColor(Me, BackgroundProperty, ColorSemiTransparent - Background, AnimationTimeOfMouseOut), "MyIconTextButton Color " & Uuid)
+                        End If
+                End Select
+
+            Else
+
+                '不使用动画
+                AniStop("MyIconTextButton Checked " & Uuid)
+                AniStop("MyIconTextButton Color " & Uuid)
+                Select Case ColorType
+                    Case ColorState.Black
+                        Background = ColorSemiTransparent
+                        ShapeLogo.SetResourceReference(Shapes.Path.FillProperty, If(IsEnabled, "ColorBrush1", "ColorBrushGray5"))
+                        LabText.SetResourceReference(TextBlock.ForegroundProperty, If(IsEnabled, "ColorBrush1", "ColorBrushGray5"))
+                    Case ColorState.Highlight
+                        Background = ColorSemiTransparent
+                        ShapeLogo.SetResourceReference(Shapes.Path.FillProperty, If(IsEnabled, "ColorBrush3", "ColorBrushGray5"))
+                        LabText.SetResourceReference(TextBlock.ForegroundProperty, If(IsEnabled, "ColorBrush3", "ColorBrushGray5"))
+                End Select
+
+            End If
+        Catch ex As Exception
+            Log(ex, "刷新按钮颜色出错")
+        End Try
+    End Sub
+
+End Class
@@ -15,7 +15,7 @@
            If _RectBack Is Nothing Then
                Dim Rect As New Border With {
                    .Name = "RectBack",
-                    .CornerRadius = New CornerRadius(If(IsScaleAnimationEnabled, 6, 0)),
+                    .CornerRadius = New CornerRadius(If(IsScaleAnimationEnabled OrElse Height > 40, 6, 0)),
                    .RenderTransform = If(IsScaleAnimationEnabled, New ScaleTransform(0.8, 0.8), Nothing),
                    .RenderTransformOrigin = New Point(0.5, 0.5),
                    .BorderThickness = New Thickness(GetWPFSize(1)),
@@ -225,6 +225,7 @@
                If _Logo.ToLower.StartsWith("http") Then
                    '网络图片
                    PathLogo = New Image With {
+                            .Tag = Me,
                            .IsHitTestVisible = LogoClickable,
                            .Source = New ImageSourceConverter().ConvertFromString(_Logo),
                            .RenderTransformOrigin = New Point(0.5, 0.5),
@@ -235,6 +236,7 @@
                    '位图
                    Dim Bitmap = New MyBitmap(_Logo)
                    PathLogo = New Canvas With {
+                            .Tag = Me,
                            .IsHitTestVisible = LogoClickable,
                            .Background = Bitmap,
                            .RenderTransformOrigin = New Point(0.5, 0.5),
@@ -252,6 +254,7 @@
                Else
                    '矢量图
                    PathLogo = New Shapes.Path With {
+                        .Tag = Me,
                        .IsHitTestVisible = LogoClickable, .HorizontalAlignment = HorizontalAlignment.Center, .VerticalAlignment = VerticalAlignment.Center, .Stretch = Stretch.Uniform,
                        .Data = (New GeometryConverter).ConvertFromString(_Logo),
                        .RenderTransformOrigin = New Point(0.5, 0.5),
@@ -267,7 +270,7 @@
                If LogoClickable Then
                    AddHandler PathLogo.MouseLeave, Sub(sender, e) IsLogoDown = False
                    AddHandler PathLogo.MouseLeftButtonDown, Sub(sender, e) IsLogoDown = True
-                    AddHandler PathLogo.MouseLeftButtonUp, Sub(sender, e) If IsLogoDown Then IsLogoDown = False : RaiseEvent LogoClick(sender, e)
+                    AddHandler PathLogo.MouseLeftButtonUp, Sub(sender, e) If IsLogoDown Then IsLogoDown = False : RaiseEvent LogoClick(sender.Tag, e)
                End If
            End If
            '改变行距
@@ -286,6 +289,9 @@
    End Property

    '图标的点击
+    ''' <summary>
+    ''' 该 Logo 是否可用点击触发事件。需要在 Logo 属性之前设置。
+    ''' </summary>
    Public Property LogoClickable As Boolean = False
    Private IsLogoDown As Boolean = False

@@ -447,7 +453,7 @@
                        RectCheck.VerticalAlignment = VerticalAlignment.Center
                        RectCheck.Margin = New Thickness(-1, 0, 0, 0)
                    End If
-                    Anim.Add(AaColor(Me, ForegroundProperty, "ColorBrush3", 200))
+                    Anim.Add(AaColor(Me, ForegroundProperty, If(Height < 40, "ColorBrush3", "ColorBrush2"), 200))
                Else
                    '由有变无
                    If Not IsNothing(RectCheck) Then
@@ -469,7 +475,7 @@
                        RectCheck.Opacity = 1
                        RectCheck.VerticalAlignment = VerticalAlignment.Stretch
                    End If
-                    SetResourceReference(ForegroundProperty, "ColorBrush3")
+                    SetResourceReference(ForegroundProperty, If(Height < 40, "ColorBrush3", "ColorBrush2"))
                Else
                    If Not IsNothing(RectCheck) Then
                        RectCheck.Height = 0
@@ -615,12 +621,14 @@
            Else
                If ButtonStack IsNot Nothing Then Ani.Add(AaOpacity(ButtonStack, -ButtonStack.Opacity, Time * 0.5))
                Ani.Add(AaOpacity(RectBack, -RectBack.Opacity, Time))
-                If IsScaleAnimationEnabled Then Ani.AddRange({
-                             AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrush7"), Time),
-                             AaScaleTransform(Me, 1 - CType(Me.RenderTransform, ScaleTransform).ScaleX, Time * 3,, New AniEaseOutFluent),
-                             AaScaleTransform(RectBack, 0.996 - CType(RectBack.RenderTransform, ScaleTransform).ScaleX, Time,, New AniEaseOutFluent),
-                             AaScaleTransform(RectBack, -0.246, 1,,, True)
-                         })
+                If IsScaleAnimationEnabled Then
+                    Ani.AddRange({
+                        AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrush7"), Time),
+                        AaScaleTransform(Me, 1 - CType(RenderTransform, ScaleTransform).ScaleX, Time * 3,, New AniEaseOutFluent),
+                        AaScaleTransform(RectBack, 0.996 - CType(RectBack.RenderTransform, ScaleTransform).ScaleX, Time,, New AniEaseOutFluent),
+                        AaScaleTransform(RectBack, -0.246, 1,,, True)
+                    })
+                End If
            End If
            AniStart(Ani, "ListItem Color " & Uuid)
        Else
@@ -647,7 +655,7 @@

    Private Sub MyListItem_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
        If Checked Then
-            SetResourceReference(ForegroundProperty, "ColorBrush3")
+            SetResourceReference(ForegroundProperty, If(Height < 40, "ColorBrush3", "ColorBrush2"))
        Else
            SetResourceReference(ForegroundProperty, "ColorBrush1")
        End If
@@ -46,7 +46,7 @@ Public Class MyLoading
        Get
            Return _Text
        End Get
-        Set(ByVal value As String)
+        Set(value As String)
            _Text = value
            RefreshText()
        End Set
@@ -57,7 +57,7 @@ Public Class MyLoading
        Get
            Return _TextError
        End Get
-        Set(ByVal value As String)
+        Set(value As String)
            _TextError = value
            RefreshText()
        End Set
@@ -4,6 +4,6 @@
             HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource ColorBrushSemiTransparent}" CornerRadius="13.5" MinHeight="27" MaxHeight="27">
    <StackPanel Orientation="Horizontal">
        <Path x:Name="ShapeLogo" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" Margin="12,0,0,0" Stretch="Uniform" Fill="White" MaxHeight="16" MaxWidth="16" VerticalAlignment="Center" />
-        <TextBlock x:Name="LabText" VerticalAlignment="Center" Grid.Column="1" Foreground="White" Margin="8,0,12,0" Grid.ColumnSpan="2" SnapsToDevicePixels="False" UseLayoutRounding="False" />
+        <TextBlock x:Name="LabText" VerticalAlignment="Center" Grid.Column="1" Foreground="White" Margin="8,0,12,1" Grid.ColumnSpan="2" SnapsToDevicePixels="False" UseLayoutRounding="False" />
    </StackPanel>
 </Border>
@@ -1,7 +1,7 @@
 Class MySearchBox
    Inherits MyCard

-    Public Event TextChanged(ByVal sender As Object, ByVal e As EventArgs)
+    Public Event TextChanged(sender As Object, e As EventArgs)
    Private Sub MySearchBox_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
        TextBox.Focus()
    End Sub
@@ -11,7 +11,7 @@
        Get
            Return TextBox.HintText
        End Get
-        Set(ByVal value As String)
+        Set(value As String)
            TextBox.HintText = value
        End Set
    End Property
@@ -19,7 +19,7 @@
        Get
            Return TextBox.Text
        End Get
-        Set(ByVal value As String)
+        Set(value As String)
            TextBox.Text = value
        End Set
    End Property
@@ -91,7 +91,7 @@
            Return GetValue(EventTypeProperty)
        End Get

-        Set(ByVal value As String)
+        Set(value As String)
            SetValue(EventTypeProperty, value)
        End Set
    End Property
@@ -101,7 +101,7 @@
            Return GetValue(EventDataProperty)
        End Get

-        Set(ByVal value As String)
+        Set(value As String)
            SetValue(EventDataProperty, value)
        End Set
    End Property