2.13.0.0

2026-07-02 23:24:29 +08:00
parent 124e3be6bf
commit c6d0457946
193 changed files with 3112 additions and 3747 deletions
@@ -1,4 +1,4 @@
-' Author: uye (owner of the MaaAssistantArknights team)
+' Author: uye (owner of the MaaAssistantArknights team)
 ' Original Source: MaaAssistantArknights project - https://github.com/MaaAssistantArknights/MaaAssistantArknights
 ' License: Apache License 2.0 (this file only)
 '
@@ -15,12 +15,6 @@
 '
 ' Date: 2025-07-03

-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Input
-Imports System.Windows.Documents
-Imports System.Linq
-
 Namespace Controls.Behaviors
    Public NotInheritable Class ClipboardInterceptor
        Private Sub New()
@@ -71,7 +65,8 @@ Namespace Controls.Behaviors
            Try
                Forms.Clipboard.Clear()
                Forms.Clipboard.SetDataObject(tb.SelectedText, True)
-            Catch
+            Catch ex As Exception
+                Logger.Warn(ex, "复制失败，请稍后再试", LogBehavior.Toast)
            End Try

            e.Handled = True
@@ -84,7 +79,8 @@ Namespace Controls.Behaviors
            Try
                Forms.Clipboard.Clear()
                Forms.Clipboard.SetDataObject(tb.SelectedText, True)
-            Catch
+            Catch ex As Exception
+                Logger.Warn(ex, "剪切失败，请稍后再试", LogBehavior.Toast)
            End Try

            tb.SelectedText = String.Empty
@@ -95,18 +91,22 @@ Namespace Controls.Behaviors
            Dim tb = TryCast(sender, TextBox)
            If tb Is Nothing Then Return

-            If Forms.Clipboard.ContainsText() Then
-                Dim pasteText = Forms.Clipboard.GetText()
+            Try
+                If Forms.Clipboard.ContainsText() Then
+                    Dim pasteText = Forms.Clipboard.GetText()

-                '将换行符替换为空格（#7825）
-                If Not tb.AcceptsReturn Then pasteText = pasteText.ReplaceLineEndings(" ", mergeMultiple:=True)
+                    '将换行符替换为空格（#7825）
+                    If Not tb.AcceptsReturn Then pasteText = pasteText.ReplaceLineEndings(" ", mergeMultiple:=True)

-                Dim start = tb.SelectionStart
+                    Dim start = tb.SelectionStart

-                tb.SelectedText = pasteText
-                tb.CaretIndex = start + pasteText.Length
-                tb.SelectionLength = 0
-            End If
+                    tb.SelectedText = pasteText
+                    tb.CaretIndex = start + pasteText.Length
+                    tb.SelectionLength = 0
+                End If
+            Catch ex As Exception
+                Logger.Warn(ex, "粘贴失败，请稍后再试", LogBehavior.Toast)
+            End Try

            e.Handled = True
        End Sub
@@ -121,7 +121,8 @@ Namespace Controls.Behaviors
            Try
                Forms.Clipboard.Clear()
                Forms.Clipboard.SetDataObject(textRange.Text, True)
-            Catch
+            Catch ex As Exception
+                Logger.Warn(ex, "复制失败，请稍后再试", LogBehavior.Toast)
            End Try

            e.Handled = True
@@ -137,7 +138,8 @@ Namespace Controls.Behaviors
            Try
                Forms.Clipboard.Clear()
                Forms.Clipboard.SetDataObject(selection.Text, True)
-            Catch
+            Catch ex As Exception
+                Logger.Warn(ex, "剪切失败，请稍后再试", LogBehavior.Toast)
            End Try

            selection.Text = String.Empty
@@ -148,16 +150,20 @@ Namespace Controls.Behaviors
            Dim rtb = TryCast(sender, RichTextBox)
            If rtb Is Nothing Then Return

-            If Not Forms.Clipboard.ContainsText() Then Return
+            Try
+                If Not Forms.Clipboard.ContainsText() Then Return

-            Dim pasteText = Forms.Clipboard.GetText()
-            Dim selection = rtb.Selection
+                Dim pasteText = Forms.Clipboard.GetText()
+                Dim selection = rtb.Selection

-            selection.Text = pasteText
+                selection.Text = pasteText

-            Dim caretPos = selection.End
-            rtb.CaretPosition = caretPos
-            rtb.Selection.Select(caretPos, caretPos)
+                Dim caretPos = selection.End
+                rtb.CaretPosition = caretPos
+                rtb.Selection.Select(caretPos, caretPos)
+            Catch ex As Exception
+                Logger.Warn(ex, "粘贴失败，请稍后再试", LogBehavior.Toast)
+            End Try

            e.Handled = True
        End Sub
@@ -183,7 +189,8 @@ Namespace Controls.Behaviors
            Try
                Forms.Clipboard.Clear()
                Forms.Clipboard.SetDataObject(sbStr, True)
-            Catch
+            Catch ex As Exception
+                Logger.Warn(ex, "复制失败，请稍后再试", LogBehavior.Toast)
            End Try

            e.Handled = True
@@ -1,4 +1,4 @@
-Imports System.Windows.Threading
+Imports System.Windows.Threading

 ''' <summary>
 ''' 指示页面可以通过按下 F5 或以其他方式刷新。
@@ -1,4 +1,4 @@
-Public Class LazyLoadBehavior
+Public Class LazyLoadBehavior

    ''' <summary>
    ''' 指定首次进入 ScrollViewer 的可视范围时执行的操作。
@@ -1,4 +1,4 @@
-<Border x:Class="MyButton"
+<Border x:Class="MyButton"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             FocusVisualStyle="{x:Null}" x:Name="PanBack"
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyButton
@@ -1,4 +1,4 @@
-Public Class MyCard
+Public Class MyCard

    '控件
    Inherits Grid
@@ -1,4 +1,4 @@
-<Grid
+<Grid
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="MyCheckBox"
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyCheckBox
@@ -1,4 +1,4 @@
-Public Class MyComboBox
+Public Class MyComboBox
    Inherits ComboBox
    Implements ISettingControl
    Public Event TextChanged(sender As Object, e As TextChangedEventArgs)
@@ -104,6 +104,7 @@
    Private Sub MyComboBox_DropDownOpened(sender As Object, e As EventArgs) Handles Me.DropDownOpened
        RealWidth = Width
        Width = ActualWidth
+        '将下拉菜单透明度与主窗口同步
        Try
            CType(Template.FindName("PanPopup", Me), Grid).Opacity = FrmMain.Opacity
        Catch ex As Exception
@@ -1,4 +1,4 @@
-Public Class MyComboBoxItem
+Public Class MyComboBoxItem
    Inherits ComboBoxItem

    '基础
@@ -1,4 +1,4 @@
-Public Class MyDropShadow
+Public Class MyDropShadow
    Inherits Decorator

    ''' <summary>
@@ -1,8 +1,8 @@
-<Grid
+<Grid
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="PanBack" mc:Ignorable="d" x:Class="MyExtraButton"
-            Width="40" RenderTransformOrigin="0.5,0.5" ToolTipService.Placement="Left" ToolTipService.VerticalOffset="16" ToolTipService.HorizontalOffset="-8" Height="0">
+            Width="40" RenderTransformOrigin="0.5,0.5" Height="0">
    <Grid.RenderTransform>
        <ScaleTransform ScaleX="0" ScaleY="0" />
    </Grid.RenderTransform>
@@ -1,4 +1,4 @@
-Public Class MyExtraButton
+Public Class MyExtraButton

    '声明
    Public Event Click(sender As Object, e As MouseButtonEventArgs) '自定义事件
@@ -1,10 +1,10 @@
-<Grid
+<Grid
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:local="clr-namespace:PCL"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    x:Name="PanBack" mc:Ignorable="d" x:Class="MyExtraTextButton"
-    RenderTransformOrigin="0.5,0.5" ToolTipService.Placement="Left" Height="52" Margin="20" Cursor="Hand">
+    RenderTransformOrigin="0.5,0.5" Height="52" Margin="20" Cursor="Hand">
    <Grid.RenderTransform>
        <ScaleTransform ScaleX="0" ScaleY="0" />
    </Grid.RenderTransform>
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyExtraTextButton
@@ -1,4 +1,4 @@
-<Border x:Class="MyHint" x:Name="PanBack"
+<Border x:Class="MyHint" x:Name="PanBack"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:PCL"
@@ -11,6 +11,6 @@
        </Grid.ColumnDefinitions>
        <TextBlock IsHitTestVisible="False" x:Name="LabText" LineHeight="16" Margin="0,0,0,-1" Padding="12,9" VerticalAlignment="Center" TextWrapping="Wrap" />
        <local:MyIconButton x:Name="BtnClose" Visibility="Collapsed" Theme="Custom" Margin="0,0,8,0" Grid.Column="1" Height="20" Width="20" VerticalAlignment="Center" Logo="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z"
-                           ToolTip="不再提示" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="29" ToolTipService.HorizontalOffset="2" />
+                           ToolTip="不再提示" />
    </Grid>
 </Border>
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyHint
@@ -1,7 +1,7 @@
-<Border x:Class="MyIconButton"
+<Border x:Class="MyIconButton"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            CornerRadius="1000" Background="{StaticResource ColorBrushSemiTransparent}" BorderThickness="0.001" Cursor="Hand">
+            CornerRadius="1000" Background="{StaticResource ColorBrushSemiTransparent}" BorderThickness="0.001">
    <Border x:Name="PanBack" CornerRadius="1000"  RenderTransformOrigin="0.5,0.5" BorderThickness="0.001" IsHitTestVisible="False">
        <Path x:Name="Path" Stretch="Uniform" Margin="5" RenderTransformOrigin="0.5,0.5">
            <Path.RenderTransform>
@@ -1,4 +1,4 @@
-Imports System.Windows.Shapes
+Imports System.Windows.Shapes

 Public Class MyIconButton

@@ -52,7 +52,9 @@ Public Class MyIconButton

    '鼠标点击判定（务必放在点击事件之后，以使得 Button_MouseUp 先于 Button_MouseLeave 执行）
    Private IsMouseDown As Boolean = False
+    Public Property CanClick As Boolean = True
    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
+        If Not CanClick Then Return
        If Not IsMouseDown Then Return
        Logger.Info($"按下图标按钮{If(String.IsNullOrEmpty(Name), "", "：" & Name)}")
        RaiseEvent Click(sender, e)
@@ -61,12 +63,14 @@ Public Class MyIconButton
        RaiseCustomEvent() '自定义事件
    End Sub
    Private Sub Button_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonDown
+        If Not CanClick Then Return
        IsMouseDown = True
        Focus()
        '指向
        AniStart(AaScaleTransform(PanBack, 0.8 - CType(PanBack.RenderTransform, ScaleTransform).ScaleX, 400,, New AniEaseOutFluent(AniEasePower.Strong)), "MyIconButton Scale " & Uuid)
    End Sub
    Private Sub Button_MouseUp() Handles Me.MouseLeftButtonUp
+        If Not CanClick Then Return
        If IsMouseDown Then
            IsMouseDown = False
            AniStart({
@@ -77,6 +81,7 @@ Public Class MyIconButton
        RefreshAnim() '直接刷新颜色以判断是否已触发 MouseLeave
    End Sub
    Private Sub Button_MouseLeave() Handles Me.MouseLeave
+        If Not CanClick Then Return
        IsMouseDown = False
        AniStart({
                     AaScaleTransform(PanBack, 1 - CType(PanBack.RenderTransform, ScaleTransform).ScaleX, 250,, New AniEaseOutFluent)
@@ -87,10 +92,9 @@ Public Class MyIconButton
    '务必放在 IsMouseDown 更新之后
    Private Const AnimationColorIn As Integer = 120
    Private Const AnimationColorOut As Integer = 150
-    Public Sub RefreshAnim() Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded
+    Public Sub RefreshAnim() Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded, Me.IsEnabledChanged
        Try
            If IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
-
                If PanBack.Background Is Nothing Then PanBack.Background = New MyColor(0, 255, 255, 255)
                If Path.Fill Is Nothing Then
                    Select Case Theme
@@ -102,9 +106,10 @@ Public Class MyIconButton
                            Path.Fill = New MyColor(160, Foreground)
                    End Select
                End If
-                If IsMouseOver Then
-                    '指向
-                    Dim AnimList As New List(Of AniData)
+                Dim AnimList As New List(Of AniData)
+                If Not IsEnabled Then
+                    AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrushGray5", AnimationColorIn))
+                ElseIf IsMouseOver Then '指向
                    Select Case Theme
                        Case Themes.Color
                            AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush2", AnimationColorIn))
@@ -117,10 +122,7 @@ Public Class MyIconButton
                        Case Themes.Custom
                            AnimList.Add(AaColor(Path, Shape.FillProperty, New MyColor(255, Foreground) - Path.Fill, AnimationColorIn))
                    End Select
-                    AniStart(AnimList, "MyIconButton Color " & Uuid)
-                Else
-                    '普通
-                    Dim AnimList As New List(Of AniData)
+                Else '普通
                    Select Case Theme
                        Case Themes.Color
                            AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush4", AnimationColorOut))
@@ -138,26 +140,27 @@ Public Class MyIconButton
                            AnimList.Add(AaColor(Path, Shape.FillProperty, New MyColor(160, Foreground) - Path.Fill, AnimationColorOut))
                            PanBack.Background = New MyColor(0, 255, 255, 255)
                    End Select
-                    AniStart(AnimList, "MyIconButton Color " & Uuid)
                End If
-
+                AniStart(AnimList, "MyIconButton Color " & Uuid)
            Else
-
                AniStop("MyIconButton Color " & Uuid)
-                Select Case Theme
-                    Case Themes.Color
-                        Path.SetResourceReference(Shape.FillProperty, "ColorBrush5")
-                    Case Themes.White
-                        Path.SetResourceReference(Shape.FillProperty, "ColorBrush8")
-                    Case Themes.Red
-                        Path.Fill = New MyColor(160, 255, 76, 76)
-                    Case Themes.Black
-                        Path.Fill = New MyColor(160, 0, 0, 0)
-                    Case Themes.Custom
-                        Path.Fill = New MyColor(160, Foreground)
-                End Select
+                If IsEnabled Then
+                    Select Case Theme
+                        Case Themes.Color
+                            Path.SetResourceReference(Shape.FillProperty, "ColorBrush5")
+                        Case Themes.White
+                            Path.SetResourceReference(Shape.FillProperty, "ColorBrush8")
+                        Case Themes.Red
+                            Path.Fill = New MyColor(160, 255, 76, 76)
+                        Case Themes.Black
+                            Path.Fill = New MyColor(160, 0, 0, 0)
+                        Case Themes.Custom
+                            Path.Fill = New MyColor(160, Foreground)
+                    End Select
+                Else
+                    Path.SetResourceReference(Shape.FillProperty, "ColorBrushGray5")
+                End If
                PanBack.Background = New MyColor(0, 255, 255, 255)
-
            End If
        Catch ex As Exception
            Logger.Warn(ex, "刷新图标按钮动画状态出错")
@@ -1,4 +1,4 @@
-<Border x:Name="PanBack" x:Class="MyIconTextButton"
+<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">
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyIconTextButton
@@ -1,4 +1,4 @@
-Public Class MyImage
+Public Class MyImage
    Inherits Image

 #Region "公开属性"
@@ -1,4 +1,4 @@
-<Grid x:Class="MyListItem"
+<Grid x:Class="MyListItem"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             x:Name="PanBack"
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyListItem
@@ -312,7 +312,8 @@ Public Class MyListItem
            Else
                '添加竖条控件
                If IsNothing(RectCheck) Then
-                    RectCheck = New Border With {.Width = 5, .Height = If(Checked, Double.NaN, 0), .CornerRadius = New CornerRadius(2, 2, 2, 2),
+                    RectCheck = New Border With {
+                        .Width = 5, .Height = If(Checked, Double.NaN, 0), .CornerRadius = New CornerRadius(2, 2, 2, 2),
                        .VerticalAlignment = If(Checked, VerticalAlignment.Stretch, VerticalAlignment.Center),
                        .HorizontalAlignment = HorizontalAlignment.Left, .UseLayoutRounding = False, .SnapsToDevicePixels = False,
                        .Margin = If(Checked, New Thickness(-1, 6, 0, 6), New Thickness(-1, 0, 0, 0))}
@@ -542,7 +543,7 @@ Public Class MyListItem

    Private StateLast As String
    Public IsMouseOverAnimationEnabled As Boolean = True
-    Public Sub RefreshColor(sender As Object, e As EventArgs) Handles Me.MouseEnter, Me.MouseLeave, Me.MouseLeftButtonDown, Me.MouseLeftButtonUp
+    Public Sub RefreshColor(sender As Object, e As EventArgs) Handles Me.MouseEnter, Me.MouseLeave, Me.PreviewMouseLeftButtonDown, Me.PreviewMouseLeftButtonUp
        '菜单虚拟化检测
        If ContentHandler IsNot Nothing Then
            ContentHandler(Me, e)
@@ -1,4 +1,4 @@
-<Grid
+<Grid
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="PanBack" mc:Ignorable="d" x:Class="MyLoading"
             MinWidth="50" MinHeight="50" Background="{StaticResource ColorBrushSemiTransparent}">
@@ -1,4 +1,4 @@
-Imports PCL.MyLoading
+Imports PCL.MyLoading

 Public Class MyLoading

@@ -76,7 +76,8 @@ Public Class MyLoading
                    If Ex Is Nothing Then
                        LabText.Text = "未知错误"
                    Else
-                        LabText.Text = If(Ex.IsBadNetwork(), "网络环境不佳，请稍后再试，或使用 VPN 改善网络环境", Ex.GetDisplay(False))
+                        Ex = Ex.RootException()
+                        LabText.Text = If(Ex.IsBadNetwork(), "网络环境不佳，请稍后再试，或使用 VPN 改善网络环境", Ex.Message)
                    End If
                Else
                    LabText.Text = TextError
@@ -1,4 +1,4 @@
-Public Class MyMenuItem
+Public Class MyMenuItem
    Inherits MenuItem

    Private Sub MyMenuItem_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -7,7 +7,9 @@
            If IconControl IsNot Nothing Then IconControl.Data = (New GeometryConverter).ConvertFromString(Icon)
        End If
        '对父级设置透明度
-        CType(Parent, ContextMenu).Opacity = Settings.Get(Of Integer)("UiLauncherTransparent") / 1000 + 0.4
+        If TypeOf Parent Is ContextMenu Then
+            CType(Parent, ContextMenu).Opacity = Settings.Get(Of Integer)("UiLauncherTransparent") / 1000 + 0.4
+        End If
    End Sub

    '基础
@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgInput"
+<Grid x:Class="MyMsgInput"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:my="clr-namespace:PCL"
@@ -1,4 +1,4 @@
-Public Class MyMsgInput
+Public Class MyMsgInput

    Private ReadOnly MyConverter As MyMsgBoxConverter
    Private ReadOnly Uuid As Integer = GetUuid()
@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgSelect"
+<Grid x:Class="MyMsgSelect"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:my="clr-namespace:PCL"
@@ -1,4 +1,4 @@
-Public Class MyMsgSelect
+Public Class MyMsgSelect

    Private ReadOnly MyConverter As MyMsgBoxConverter
    Private ReadOnly Uuid As Integer = GetUuid()
@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgText"
+<Grid x:Class="MyMsgText"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:my="clr-namespace:PCL"
@@ -1,4 +1,4 @@
-Public Class MyMsgText
+Public Class MyMsgText

    Private ReadOnly MyConverter As MyMsgBoxConverter
    Private ReadOnly Uuid As Integer = GetUuid()
@@ -1,4 +1,4 @@
-Public Class MyPageLeft
+Public Class MyPageLeft
    Inherits Grid
    Private Uuid As Integer = GetUuid()

@@ -1,4 +1,4 @@
-Public Class MyPageRight
+Public Class MyPageRight
    Inherits AdornerDecorator
    Public PageUuid As Integer = GetUuid()

@@ -153,7 +153,7 @@
    '重试
    Public Sub PageLoaderRestart(Optional Input As Object = Nothing, Optional IsForceRestart As Boolean = True) '由外部调用的重试
        If Not PageLoaderAutoRun Then Return
-        If PageLoader.GetType.Name.StartsWithF("LoaderTask") Then
+        If GeneralUtils.IsGenericInstanceOf(PageLoader, GetType(LoaderTask(Of ,))) OrElse TypeOf PageLoader Is LoaderWorker Then
            PageLoader.Start(CType(PageLoader, Object).StartGetInput(Input, PageLoaderInputInvoke), IsForceRestart:=IsForceRestart)
        Else
            If Input Is Nothing AndAlso PageLoaderInputInvoke IsNot Nothing Then Input = PageLoaderInputInvoke()
@@ -175,7 +175,7 @@
        RaiseEvent PageEnter()
        Select Case PageState
            Case PageStates.Empty
-                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Interrupted Then
+                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Canceled Then
                    '如果加载器在进入页面时不启动（例如联机），那么在此时就会有 State = Waiting
                    PageState = PageStates.ContentEnter
                    TriggerEnterAnimation(PanAlways, If(PanContent, Child))
@@ -188,7 +188,7 @@
                End If
            Case PageStates.ContentExit
                '和上面的一样，但是不管 PanAlways
-                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Interrupted Then
+                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Canceled Then
                    PageState = PageStates.ContentEnter
                    TriggerEnterAnimation(If(PanContent, Child))
                ElseIf PageLoader.State = LoadState.Loading Then
@@ -364,9 +364,9 @@
                    Case PageStates.LoaderExit
                        PageState = PageStates.ContentExit
                End Select
-            Case LoadState.Finished, LoadState.Interrupted, LoadState.Waiting
+            Case LoadState.Finished, LoadState.Canceled, LoadState.Waiting
                If Not (OldState = LoadState.Failed OrElse OldState = LoadState.Loading) Then Return
-                Logger.Trace("已触发 PageLoaderState (Stop/Interrupt)")
+                Logger.Trace("已触发 PageLoaderState (Stop/Canceled)")
                '运行结束
                '需要从 LoaderWait 切换到 ContentEnter，或从 LoaderStay 切换到 LoaderExit
                Select Case PageState
@@ -1,4 +1,4 @@
-<Grid x:Class="MyRadioBox"
+<Grid x:Class="MyRadioBox"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             FocusVisualStyle="{x:Null}"
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 Imports System.Windows.Shapes

 <ContentProperty("Inlines")>
@@ -1,4 +1,4 @@
-<Border x:Name="PanBack" x:Class="MyRadioButton"
+<Border x:Name="PanBack" x:Class="MyRadioButton"
             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">
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("Inlines")>
 Public Class MyRadioButton
@@ -1,4 +1,4 @@
-Imports System.Runtime.InteropServices
+Imports System.Runtime.InteropServices
 Imports System.Windows.Interop
 Imports System.Windows.Threading

@@ -1,4 +1,4 @@
-Public Class MyScrollBar
+Public Class MyScrollBar
    Inherits Primitives.ScrollBar

    '基础
@@ -1,9 +1,8 @@
-Public Class MyScrollViewer
+Public Class MyScrollViewer
    Inherits ScrollViewer

    Public Property DeltaMult As Double = 1

-
    Private RealOffset As Double
    Private Sub MyScrollViewer_PreviewMouseWheel(sender As Object, e As MouseWheelEventArgs) Handles Me.PreviewMouseWheel
        If e.Delta = 0 OrElse ActualHeight = 0 OrElse ScrollableHeight = 0 Then Return
@@ -12,7 +11,7 @@
                (GetType(ComboBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, ComboBox).IsDropDownOpen) OrElse
                (GetType(TextBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, TextBox).AcceptsReturn) OrElse
                GetType(ComboBoxItem).IsAssignableFrom(SourceType) OrElse
-                TypeOf e.Source Is CheckBox) Then
+                PresentationSource.FromVisual(e.Source)?.RootVisual?.GetType().FullName = "System.Windows.Controls.Primitives.PopupRoot") Then
            '如果当前是在对有滚动条的下拉框或文本框执行，则不接管操作
            Return
        End If
@@ -1,4 +1,4 @@
-<local:MyCard x:Class="MySearchBox"
+<local:MyCard x:Class="MySearchBox"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -1,4 +1,4 @@
-Class MySearchBox
+Class MySearchBox
    Inherits MyCard

    Public Event TextChanged(sender As Object, e As EventArgs)
@@ -1,4 +1,4 @@
-<Border x:Class="MySlider"
+<Border x:Class="MySlider"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -1,4 +1,4 @@
-Imports System.Windows.Shapes
+Imports System.Windows.Shapes

 Public Class MySlider
    Implements ISettingControl
@@ -1,4 +1,4 @@
-<Border x:Class="MySliderDot"
+<Border x:Class="MySliderDot"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -1,4 +1,4 @@
-Public Class MySliderDot
+Public Class MySliderDot

    '基础

@@ -1,4 +1,4 @@
-Public Class MyTextBox
+Public Class MyTextBox
    Inherits TextBox
    Implements ISettingControl

@@ -1,4 +1,4 @@
-Public Class MyTextButton
+Public Class MyTextButton
    Inherits Label

    Public Event Click(sender As Object, e As EventArgs)
@@ -1,4 +1,4 @@
-Public Class MyVirtualizingElement(Of T As FrameworkElement)
+Public Class MyVirtualizingElement(Of T As FrameworkElement)
    Inherits FrameworkElement

    Private Initializer As Func(Of T)
@@ -58,7 +58,7 @@ Public Class MyVirtualizingElement
    ''' 如果类型错误，则返回原值。
    ''' </summary>
    Public Shared Function TryInit(Element As FrameworkElement) As FrameworkElement
-        If GetType(MyVirtualizingElement(Of )).IsInstanceOfGenericType(Element) Then
+        If GeneralUtils.IsGenericInstanceOf(Element, GetType(MyVirtualizingElement(Of ))) Then
            Return CType(Element, Object).Init()
        ElseIf TypeOf Element Is MyVirtualizingElement Then
            Return CType(Element, MyVirtualizingElement).Init()