From edbf4aefda37513bd73045dee81d36c0e6e3a9f6 Mon Sep 17 00:00:00 2001
From: Constrat <56174894+Constrat@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:26:33 +0100
Subject: [PATCH] Style/gui consistency (#9567)

---
 src/MaaWpfGui/Views/UI/CopilotView.xaml       |  5 --
 src/MaaWpfGui/Views/UI/SettingsView.xaml      |  7 +-
 .../UserControl/GameClientUserControl.xaml    |  2 +-
 .../UserControl/TimerSettingsUserControl.xaml | 64 +++++++------------
 4 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/src/MaaWpfGui/Views/UI/CopilotView.xaml b/src/MaaWpfGui/Views/UI/CopilotView.xaml
index 092d15c08f..a6650770c8 100644
--- a/src/MaaWpfGui/Views/UI/CopilotView.xaml
+++ b/src/MaaWpfGui/Views/UI/CopilotView.xaml
@@ -97,14 +97,12 @@
                         Content="{DynamicResource AutoSquad}"
                         IsChecked="{Binding Form}"
                         IsEnabled="{Binding Idle}"
-                        IsHitTestVisible="{Binding Idle}"
                         ToolTip="{DynamicResource AutoSquadTip}" />
                     <CheckBox
                         HorizontalAlignment="Center"
                         Content="{DynamicResource UseCopilotList}"
                         IsChecked="{Binding UseCopilotList}"
                         IsEnabled="{Binding Idle}"
-                        IsHitTestVisible="{Binding Idle}"
                         ToolTip="{DynamicResource UseCopilotListTip}" />
                 </StackPanel>
                 <StackPanel
@@ -117,7 +115,6 @@
                         Content="{DynamicResource AddUserAdditional}"
                         IsChecked="{Binding AddUserAdditional}"
                         IsEnabled="{Binding Idle}"
-                        IsHitTestVisible="{Binding Idle}"
                         ToolTip="{DynamicResource AddUserAdditionalTip}" />
                     <TextBox
                         MinWidth="140"
@@ -143,7 +140,6 @@
                         Content="{DynamicResource AddTrust}"
                         IsChecked="{Binding AddTrust}"
                         IsEnabled="{Binding Idle}"
-                        IsHitTestVisible="{Binding Idle}"
                         Visibility="{c:Binding Form}" />
                     <CheckBox
                         Height="30"
@@ -152,7 +148,6 @@
                         Content="{DynamicResource UseSanityPotion}"
                         IsChecked="{Binding UseSanityPotion}"
                         IsEnabled="{Binding Idle}"
-                        IsHitTestVisible="{Binding Idle}"
                         Visibility="{c:Binding UseCopilotList}" />
                 </StackPanel>
                 <StackPanel
diff --git a/src/MaaWpfGui/Views/UI/SettingsView.xaml b/src/MaaWpfGui/Views/UI/SettingsView.xaml
index 0c2d2ad4b2..9122fe5628 100644
--- a/src/MaaWpfGui/Views/UI/SettingsView.xaml
+++ b/src/MaaWpfGui/Views/UI/SettingsView.xaml
@@ -52,13 +52,12 @@
                 <userControl:TimerSettingsUserControl Margin="0,20" HorizontalAlignment="Center" />
 
                 <hc:Divider Content="{Binding ListTitle[2]}" />
-                <userControl:PerformanceUserControl Margin="0,20" HorizontalAlignment="Center" />
-                
+                <userControl:PerformanceUserControl Margin="0,20" HorizontalAlignment="Center" IsEnabled="{Binding Idle}" />
+
                 <hc:Divider Content="{Binding ListTitle[3]}" />
                 <userControl:GameClientUserControl
                     Margin="0,20"
-                    HorizontalAlignment="Center"
-                    IsEnabled="{Binding Idle}" />
+                    HorizontalAlignment="Center"/>
 
                 <hc:Divider Content="{Binding ListTitle[4]}" />
                 <userControl:ConnectSettingsUserControl
diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
index 49d09d7223..578ba29775 100644
--- a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
@@ -33,7 +33,7 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             DisplayMemberPath="Display"
-            IsHitTestVisible="{Binding Idle}"
+            IsEnabled="{Binding Idle}"
             ItemsSource="{Binding ClientTypeList}"
             SelectedValue="{Binding ClientType}"
             SelectedValuePath="Value" />
diff --git a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
index 9b30b45bfe..145d50ded7 100644
--- a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
@@ -91,7 +91,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[0].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[0].IsOn}"
                             Text="{Binding TimerModels.Timers[0].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -99,7 +99,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[0].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[0].IsOn}"
                             Text="{Binding TimerModels.Timers[0].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -109,9 +109,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[0].TimerConfig}"
                     SelectedValuePath="Value"
@@ -133,7 +131,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[1].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[1].IsOn}"
                             Text="{Binding TimerModels.Timers[1].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -141,7 +139,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[1].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[1].IsOn}"
                             Text="{Binding TimerModels.Timers[1].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -151,9 +149,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[1].TimerConfig}"
                     SelectedValuePath="Value"
@@ -175,7 +171,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[2].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[2].IsOn}"
                             Text="{Binding TimerModels.Timers[2].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -183,7 +179,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[2].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[2].IsOn}"
                             Text="{Binding TimerModels.Timers[2].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -193,9 +189,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[2].TimerConfig}"
                     SelectedValuePath="Value"
@@ -217,7 +211,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[3].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[3].IsOn}"
                             Text="{Binding TimerModels.Timers[3].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -225,7 +219,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[3].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[3].IsOn}"
                             Text="{Binding TimerModels.Timers[3].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -235,9 +229,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[3].TimerConfig}"
                     SelectedValuePath="Value"
@@ -259,7 +251,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[4].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[4].IsOn}"
                             Text="{Binding TimerModels.Timers[4].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -267,7 +259,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[4].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[4].IsOn}"
                             Text="{Binding TimerModels.Timers[4].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -277,9 +269,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[4].TimerConfig}"
                     SelectedValuePath="Value"
@@ -301,7 +291,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[5].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[5].IsOn}"
                             Text="{Binding TimerModels.Timers[5].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -309,7 +299,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[5].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[5].IsOn}"
                             Text="{Binding TimerModels.Timers[5].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -319,9 +309,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[5].TimerConfig}"
                     SelectedValuePath="Value"
@@ -343,7 +331,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[6].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[6].IsOn}"
                             Text="{Binding TimerModels.Timers[6].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -351,7 +339,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[6].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[6].IsOn}"
                             Text="{Binding TimerModels.Timers[6].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -361,9 +349,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[6].TimerConfig}"
                     SelectedValuePath="Value"
@@ -385,7 +371,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[7].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[7].IsOn}"
                             Text="{Binding TimerModels.Timers[7].Hour, StringFormat=D2}"
                             TextWrapping="Wrap" />
                         <controls:TextBlock Text=":" />
@@ -393,7 +379,7 @@
                             Width="35"
                             Margin="10"
                             InputMethod.IsInputMethodEnabled="False"
-                            IsReadOnly="{c:Binding !TimerModels.Timers[7].IsOn}"
+                            IsEnabled="{c:Binding TimerModels.Timers[7].IsOn}"
                             Text="{Binding TimerModels.Timers[7].Min, StringFormat=D2}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -403,9 +389,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Focusable="False"
-                    IsEditable="True"
-                    IsHitTestVisible="{Binding Idle}"
-                    IsReadOnly="True"
+                    IsEnabled="{Binding Idle}"
                     ItemsSource="{Binding ConfigurationList}"
                     SelectedValue="{Binding TimerModels.Timers[7].TimerConfig}"
                     SelectedValuePath="Value"