From ebfed4243b49e7c66169f6a68bb80fd383949795 Mon Sep 17 00:00:00 2001
From: tangge233 <2697992791@qq.com>
Date: Mon, 5 Aug 2024 00:22:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=82=E5=BD=93=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=20Mod=20=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionMod.xaml     |  4 ++--
 .../Pages/PageVersion/PageVersionMod.xaml.vb  | 21 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml
index 766dd51..abae719 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml	
@@ -8,7 +8,8 @@
         <Grid x:Name="PanAllBack">
             <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
                 <StackPanel x:Name="PanMain" Margin="25,10,25,10" Grid.IsSharedSizeScope="True"> <!-- 若显示多选模块则为 92 -->
-                    <local:MyCard Grid.Row="0" Margin="0,15" x:Name="PanManage">
+                    <local:MySearchBox Margin="0,15" HintText="搜索 Mod 名称 / 描述 / 标签" x:Name="SearchBox" />
+                    <local:MyCard Grid.Row="0" Margin="0,0,0,15" x:Name="PanManage">
                         <Grid Margin="15,15,0,15" Height="35">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
@@ -22,7 +23,6 @@
                             <local:MyButton x:Name="BtnManageCheck" Grid.Column="3" MinWidth="140" Text="检查 Mod" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ToolTip="快速检查 Mod 的版本要求、重复、前置缺失等问题。&#xa;结果仅供参考，由于部分 Mod 标注的信息有误，可能并不准确。" Visibility="Collapsed" />
                         </Grid>
                     </local:MyCard>
-                    <local:MySearchBox Margin="0,0,0,15" HintText="搜索 Mod 名称 / 描述 / 标签" x:Name="SearchBox" />
                     <local:MyCard x:Name="PanUpdateListBack" VerticalAlignment="Top" Opacity="0" Margin="0,0,0,15" Title=" " MinHeight="40" CanSwap="True">
                         <StackPanel Margin="20,38,18,18" Name="PanUpdateList" VerticalAlignment="Top" />
                     </local:MyCard>
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
index 28350a9..7e720c0 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
@@ -312,16 +312,17 @@
     Private Sub ChangeAllSelected(Value As Boolean)
         AniControlEnabled += 1
         SelectedMods.Clear()
-        ChangeTargetListSeleted(PanUpdateList, Value)
-        ChangeTargetListSeleted(PanDisabledList, Value)
-        ChangeTargetListSeleted(PanUnavaliableList, Value)
-        ChangeTargetListSeleted(PanDefaultList, Value)
+        ChangeTargetListSeleted(PanUpdateListBack, PanUpdateList, Value)
+        ChangeTargetListSeleted(PanDisabledListBack, PanDisabledList, Value)
+        ChangeTargetListSeleted(PanUnavaliableListBack, PanUnavaliableList, Value)
+        ChangeTargetListSeleted(PanDefaultListBack, PanDefaultList, Value)
         AniControlEnabled -= 1
         '更新下边栏 UI
         RefreshBottomBar()
     End Sub
 
-    Private Sub ChangeTargetListSeleted(List As StackPanel, Value As Boolean)
+    Private Sub ChangeTargetListSeleted(Card As MyCard, List As StackPanel, Value As Boolean)
+        If Value.Equals(True) Then Card.IsSwaped = False
         For Each Item As MyLocalModItem In List.Children
             Item.Checked = Value
             If Value Then SelectedMods.Add(Item.Entry.RawFileName)
@@ -435,6 +436,16 @@
     ''' 记录正在进行 Mod 更新的 mods 文件夹路径。
     ''' </summary>
     Public Shared UpdatingVersions As New List(Of String)
+
+    Public Sub New()
+
+        ' 此调用是设计器所必需的。
+        InitializeComponent()
+
+        ' 在 InitializeComponent() 调用之后添加任何初始化。
+
+    End Sub
+
     Public Sub UpdateMods(ModList As IEnumerable(Of McMod))
         '更新前警告
         If Not Setup.Get("HintUpdateMod") Then