From 62811e7c3d350ed064f924f9bd84f3ff223c738b Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Thu, 5 Oct 2023 16:13:36 +0800
Subject: [PATCH] modified style.

---
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml | 88 +++++++++++++-----------
 LiaoTian_Cup/Mode/HubModeWindow.xaml     | 86 ++++++++++++-----------
 LiaoTian_Cup/Mode/USuckModeWindow.xaml   | 88 +++++++++++++-----------
 3 files changed, 142 insertions(+), 120 deletions(-)

diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
index 1deadca..b71dca7 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
@@ -23,8 +23,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="160" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -161,49 +160,58 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml b/LiaoTian_Cup/Mode/HubModeWindow.xaml
index 4ed7efb..cc49428 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml
@@ -24,8 +24,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -196,49 +195,56 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+            <Grid Grid.Row="0">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                    <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="SelectFactor2" />
+                    <Image x:Name="SelectFactor3" />
+                    <Image x:Name="SelectFactor4" />
+                    <Image x:Name="SelectFactor5" />
+                    <Image x:Name="SelectFactor6" />
+                    <Image x:Name="SelectFactor7" />
+                    <Image x:Name="SelectFactor8" />
+                </StackPanel>
+            </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
+
+                    <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="BeforeCommander2" />
+                    <Image x:Name="BeforeCommander3" />
+                    <Image x:Name="BeforeCommander4" />
+                    <Image x:Name="BeforeCommander5" />
+                    <Image x:Name="BeforeCommander6" />
+                    <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="AfterCommander2" />
+                    <Image x:Name="AfterCommander3" />
+                    <Image x:Name="AfterCommander4" />
+                </StackPanel>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
index 65d386a..cf29577 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
@@ -23,8 +23,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -193,49 +192,58 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />