From f1ff969090dc376f90837139b5280af04c1166ec Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 1 Jun 2024 12:46:31 +0800
Subject: [PATCH] fix: change list in grid mode looks and works weird (#157)

---
 src/Resources/Locales/en_US.axaml       | 6 +++---
 src/Resources/Locales/zh_CN.axaml       | 6 +++---
 src/Views/ChangeCollectionView.axaml    | 7 ++-----
 src/Views/ChangeCollectionView.axaml.cs | 6 +-----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index aeaa1633..edf3fe1a 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -52,9 +52,9 @@
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCEL</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">CHANGE DISPLAY MODE</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Show as Grid</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Show as List</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Show as Tree</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Show as File and Dir List</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Show as Path List</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Show as Filesystem Tree</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Warning: By doing a commit checkout, your Head will be detached</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c65eda03..015cb6cc 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -55,9 +55,9 @@
   <x:String x:Key="Text.Bytes" xml:space="preserve">字节</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取    消</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">切换变更显示模式</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">网格模式</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">列表模式</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">树形模式</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">文件名+路径列表模式</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">全路径列表模式</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">文件目录树形结构模式</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">检出(checkout)分支</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">检出(checkout)提交</x:String>
   <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">注意：执行该操作后，当前HEAD会变为游离(detached)状态!</x:String>
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index b09d76d2..87c729e7 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -31,16 +31,13 @@
         </StackPanel>
       </DataTemplate>
 
-      <DataTemplate x:Key="GridModeFileTemplate" DataType="m:Change">
+      <DataTemplate x:Key="GridModeTemplate" DataType="m:Change">
         <StackPanel Orientation="Horizontal">
           <v:ChangeStatusIcon Width="14" Height="14" IsWorkingCopyChange="{Binding #me.IsWorkingCopyChange}" Change="{Binding}" Margin="4,0,0,0"/>
           <TextBlock Classes="monospace" Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}" Margin="4,0"/>
+          <TextBlock Classes="monospace" Text="{Binding Path, Converter={x:Static c:PathConverters.PureDirectoryName}}" Foreground="{DynamicResource Brush.FG2}"/>
         </StackPanel>
       </DataTemplate>
-
-      <DataTemplate x:Key="GridModeDirTemplate" DataType="m:Change">
-        <TextBlock Classes="monospace" Text="{Binding Path, Converter={x:Static c:PathConverters.PureDirectoryName}}" Foreground="{DynamicResource Brush.FG2}"/>
-      </DataTemplate>
     </TreeDataGrid.Resources>
   </TreeDataGrid>
 </UserControl>
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 81ce514c..5c42b07c 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -155,11 +155,7 @@ namespace SourceGit.Views
             {
                 var source = new FlatTreeDataGridSource<Models.Change>(changes)
                 {
-                    Columns =
-                    {
-                        new TemplateColumn<Models.Change>(null, "GridModeFileTemplate", null, GridLength.Auto),
-                        new TemplateColumn<Models.Change>(null, "GridModeDirTemplate", null, GridLength.Auto)
-                    },
+                    Columns = { new TemplateColumn<Models.Change>(null, "GridModeTemplate", null, GridLength.Auto) },
                 };
 
                 var selection = new Models.TreeDataGridSelectionModel<Models.Change>(source, null);