From adc5e1941f0fb63767faf99503d0c8a4381607eb Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sat, 28 Mar 2026 13:21:06 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"perf:=20=E4=BC=98=E5=8C=96=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=88=98=E6=96=97=20tab=20=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=88=87=E9=A1=B5=E9=87=8D=E7=BD=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 310c1d1b280b16c1f65e366ba9c8a6509330782d. --- src/MaaWpfGui/Res/Style.xaml | 1 - src/MaaWpfGui/Res/Styles/RadioButton.xaml | 38 ----------- .../ViewModels/UI/CopilotViewModel.cs | 49 +-------------- src/MaaWpfGui/Views/UI/CopilotView.xaml | 63 ++++++++++--------- 4 files changed, 36 insertions(+), 115 deletions(-) delete mode 100644 src/MaaWpfGui/Res/Styles/RadioButton.xaml diff --git a/src/MaaWpfGui/Res/Style.xaml b/src/MaaWpfGui/Res/Style.xaml index 5587eae553..b77449eb67 100644 --- a/src/MaaWpfGui/Res/Style.xaml +++ b/src/MaaWpfGui/Res/Style.xaml @@ -7,7 +7,6 @@ - diff --git a/src/MaaWpfGui/Res/Styles/RadioButton.xaml b/src/MaaWpfGui/Res/Styles/RadioButton.xaml deleted file mode 100644 index e41e217e80..0000000000 --- a/src/MaaWpfGui/Res/Styles/RadioButton.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - diff --git a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs index 980128719a..0f007d0829 100644 --- a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs @@ -44,6 +44,7 @@ using Stylet; using static MaaWpfGui.Helper.CopilotHelper; using static MaaWpfGui.Helper.PathsHelper; using static MaaWpfGui.Models.AsstTasks.AsstCopilotTask; +using static Microsoft.WindowsAPICodePack.Shell.PropertySystem.SystemProperties.System; using DataFormats = System.Windows.Forms.DataFormats; using Task = System.Threading.Tasks.Task; @@ -249,54 +250,6 @@ public partial class CopilotViewModel : Screen } } - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsMainCopilotTabSelected - { - get => CopilotTabIndex == 0; - set { - if (value) - { - CopilotTabIndex = 0; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsSssCopilotTabSelected - { - get => CopilotTabIndex == 1; - set { - if (value) - { - CopilotTabIndex = 1; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsParadoxCopilotTabSelected - { - get => CopilotTabIndex == 2; - set { - if (value) - { - CopilotTabIndex = 2; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsActivityCopilotTabSelected - { - get => CopilotTabIndex == 3; - set { - if (value) - { - CopilotTabIndex = 3; - } - } - } - private string _displayFilename = string.Empty; /// diff --git a/src/MaaWpfGui/Views/UI/CopilotView.xaml b/src/MaaWpfGui/Views/UI/CopilotView.xaml index 20c8e9b877..07a2350ed9 100644 --- a/src/MaaWpfGui/Views/UI/CopilotView.xaml +++ b/src/MaaWpfGui/Views/UI/CopilotView.xaml @@ -38,34 +38,41 @@ Grid.Row="0" HorizontalAlignment="Center" Orientation="Vertical"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +