From e9297096dff66549a3ad669e99868657a7ee7568 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 13:30:56 +0800
Subject: [PATCH] enhance: remember last view mode in file histories view

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/FileHistories.cs | 24 ++++++++----------------
 src/Views/FileHistories.axaml   |  4 ----
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 5ebbf6a6..ab12e596 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -36,22 +36,13 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, object prev)
+        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
         {
             _repo = repo;
             _file = file;
             _revision = revision;
-
-            if (prev is FileHistoriesSingleRevision singleRevision)
-            {
-                _isDiffMode = singleRevision._isDiffMode;
-                _viewContent = singleRevision._viewContent;
-            }
-            else
-            {
-                _isDiffMode = true;
-                _viewContent = null;
-            }
+            _isDiffMode = prevIsDiffMode;
+            _viewContent = null;
 
             RefreshViewContent();
         }
@@ -283,13 +274,13 @@ namespace SourceGit.ViewModels
 
             SelectedCommits.CollectionChanged += (_, _) =>
             {
+                if (_viewContent is FileHistoriesSingleRevision singleRevision)
+                    _prevIsDiffMode = singleRevision.IsDiffMode;
+
                 switch (SelectedCommits.Count)
                 {
-                    case 0:
-                        ViewContent = new Models.Null();
-                        break;
                     case 1:
-                        ViewContent = new FileHistoriesSingleRevision(_repo, _file, SelectedCommits[0], _viewContent);
+                        ViewContent = new FileHistoriesSingleRevision(_repo, _file, SelectedCommits[0], _prevIsDiffMode);
                         break;
                     case 2:
                         ViewContent = new FileHistoriesCompareRevisions(_repo, _file, SelectedCommits[0], SelectedCommits[1]);
@@ -309,6 +300,7 @@ namespace SourceGit.ViewModels
         private readonly Repository _repo = null;
         private readonly string _file = null;
         private bool _isLoading = true;
+        private bool _prevIsDiffMode = true;
         private List<Models.Commit> _commits = null;
         private object _viewContent = null;
     }
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 688552e0..124b2e00 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -109,10 +109,6 @@
 
       <ContentControl Grid.Column="2" Content="{Binding ViewContent}">
         <ContentControl.DataTemplates>
-          <DataTemplate DataType="m:Null">
-            <Border/>
-          </DataTemplate>
-
           <DataTemplate DataType="vm:FileHistoriesSingleRevision">
             <Grid RowDefinitions="Auto,*,Auto">
               <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal">