From d52fc37b65428144344d7b7ba626d761cb7cfcf9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 6 Aug 2021 11:56:50 +0800
Subject: [PATCH] style<Reset>: mode option style

---
 src/Models/ResetMode.cs     |  2 +-
 src/Views/Popups/Reset.xaml | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Models/ResetMode.cs b/src/Models/ResetMode.cs
index 1fec8139..4532bcf1 100644
--- a/src/Models/ResetMode.cs
+++ b/src/Models/ResetMode.cs
@@ -13,7 +13,7 @@ namespace SourceGit.Models {
 
         public static List<ResetMode> Supported = new List<ResetMode>() {
             new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green),
-            new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Yellow),
+            new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange),
             new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red),
         };
 
diff --git a/src/Views/Popups/Reset.xaml b/src/Views/Popups/Reset.xaml
index 640101af..f0263898 100644
--- a/src/Views/Popups/Reset.xaml
+++ b/src/Views/Popups/Reset.xaml
@@ -63,11 +63,17 @@
             VerticalAlignment="Center">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Width="12" Height="12" Margin="4,0,0,0" Fill="{Binding Color}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
-                        <TextBlock Text="{Binding Name}" Margin="4,0"/>
-                        <TextBlock Text="{Binding Desc}" Margin="4,0" FontFamily="Microsoft YaHei UI" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-                    </StackPanel>
+                    <Grid Height="20">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="20"/>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Path Grid.Column="0" Width="12" Height="12" Fill="{Binding Color}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="4,0,0,0"/>
+                        <TextBlock Grid.Column="2" Text="{Binding Desc}" FontFamily="Microsoft YaHei UI" FontSize="11" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                    </Grid>
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>