feature: add an option to set the default active tab in commit details panel (#1784)

love-linger · love-linger · commit 70caa00e748c · 2025-09-02T18:34:19.000+08:00
NOTE: This option only affects the tab that is activated when the commit details panel is first displayed after the repository is opened. After that, the repository will retain the last activated tab instead of resetting to the default.
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -567,6 +567,7 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">Show `LOCAL CHANGES` page by default</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">Show `CHANGES` tab in commit detail by default</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
   <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Show tags in commit graph</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
@@ -571,6 +571,7 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">最大历史提交数</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">在提交路线图中显示修改时间而非提交时间</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">默认显示【本地更改】页</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">在提交详情页默认打开【变更对比】标签页</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">在提交详情页中显示子提交列表</x:String>
   <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">在提交路线图中显示标签</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">SUBJECT字数检测</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
@@ -571,6 +571,7 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">最大歷史提交數</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">在提交路線圖中顯示修改時間而非提交時間</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">預設顯示「本機變更」頁面</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">在提交詳細資訊頁面預設顯示【變更對比】</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">在提交詳細資訊中顯示後續提交</x:String>
   <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">在路線圖中顯示標籤</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">提交標題字數偵測</x:String>
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
@@ -10,24 +10,34 @@
 
 namespace SourceGit.ViewModels
 {
+    public class CommitDetailSharedData
+    {
+        public int ActiveTabIndex
+        {
+            get;
+            set;
+        }
+
+        public CommitDetailSharedData()
+        {
+            ActiveTabIndex = Preferences.Instance.ShowChangesInCommitDetailByDefault ? 1 : 0;
+        }
+    }
+
     public partial class CommitDetail : ObservableObject, IDisposable
     {
         public Repository Repository
         {
             get => _repo;
         }
 
-        public int ActivePageIndex
+        public int ActiveTabIndex
         {
-            get => _rememberActivePageIndex ? _repo.CommitDetailActivePageIndex : _activePageIndex;
+            get => _sharedData.ActiveTabIndex;
             set
             {
-                if (_rememberActivePageIndex)
-                    _repo.CommitDetailActivePageIndex = value;
-                else
-                    _activePageIndex = value;
-
-                OnPropertyChanged();
+                if (value != _sharedData.ActiveTabIndex)
+                    _sharedData.ActiveTabIndex = value;
             }
         }
 
@@ -142,10 +152,10 @@ public bool CanOpenRevisionFileWithDefaultEditor
             private set => SetProperty(ref _canOpenRevisionFileWithDefaultEditor, value);
         }
 
-        public CommitDetail(Repository repo, bool rememberActivePageIndex)
+        public CommitDetail(Repository repo, CommitDetailSharedData sharedData)
         {
             _repo = repo;
-            _rememberActivePageIndex = rememberActivePageIndex;
+            _sharedData = sharedData ?? new CommitDetailSharedData();
             WebLinks = Models.CommitLink.Get(repo.Remotes);
         }
 
@@ -569,8 +579,7 @@ private async Task SetViewingCommitAsync(Models.Object file)
         private static partial Regex REG_SHA_FORMAT();
 
         private Repository _repo = null;
-        private bool _rememberActivePageIndex = true;
-        private int _activePageIndex = 0;
+        private CommitDetailSharedData _sharedData = null;
         private Models.Commit _commit = null;
         private Models.CommitFullMessage _fullMessage = null;
         private Models.CommitSignInfo _signInfo = null;
diff --git a/src/ViewModels/DirHistories.cs b/src/ViewModels/DirHistories.cs
@@ -48,7 +48,7 @@ public DirHistories(Repository repo, string dir, string revision = null)
                 Title = dir;
 
             _repo = repo;
-            _detail = new CommitDetail(repo, false);
+            _detail = new CommitDetail(repo, null);
             _detail.SearchChangeFilter = dir;
 
             Task.Run(async () =>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
@@ -89,6 +89,7 @@ public GridLength BottomArea
         public Histories(Repository repo)
         {
             _repo = repo;
+            _commitDetailSharedData = new CommitDetailSharedData();
         }
 
         public void Dispose()
@@ -173,7 +174,7 @@ public void Select(IList commits)
                 }
                 else
                 {
-                    var commitDetail = new CommitDetail(_repo, true);
+                    var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);
                     commitDetail.Commit = commit;
                     DetailContext = commitDetail;
                 }
@@ -392,14 +393,15 @@ private void NavigateTo(Models.Commit commit)
                 }
                 else
                 {
-                    var commitDetail = new CommitDetail(_repo, true);
+                    var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);
                     commitDetail.Commit = commit;
                     DetailContext = commitDetail;
                 }
             }
         }
 
         private Repository _repo = null;
+        private CommitDetailSharedData _commitDetailSharedData = null;
         private bool _isLoading = true;
         private List<Models.Commit> _commits = new List<Models.Commit>();
         private Models.CommitGraph _graph = null;
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
@@ -122,7 +122,7 @@ public object Detail
         public InteractiveRebase(Repository repo, Models.Commit on, InteractiveRebasePrefill prefill = null)
         {
             _repo = repo;
-            _commitDetail = new CommitDetail(repo, false);
+            _commitDetail = new CommitDetail(repo, null);
             Current = repo.CurrentBranch;
             On = on;
             IsLoading = true;
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
@@ -125,6 +125,12 @@ public bool ShowLocalChangesByDefault
             set;
         } = false;
 
+        public bool ShowChangesInCommitDetailByDefault
+        {
+            get;
+            set;
+        } = false;
+
         public int MaxHistoryCommits
         {
             get => _maxHistoryCommits;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -472,12 +472,6 @@ public bool IsAutoFetching
             private set => SetProperty(ref _isAutoFetching, value);
         }
 
-        public int CommitDetailActivePageIndex
-        {
-            get;
-            set;
-        } = 0;
-
         public AvaloniaList<Models.IssueTracker> IssueTrackers
         {
             get;
diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CommitDetail"
              x:DataType="vm:CommitDetail">
-  <TabControl SelectedIndex="{Binding ActivePageIndex, Mode=TwoWay}" Padding="4">
+  <TabControl SelectedIndex="{Binding ActiveTabIndex, Mode=TwoWay}" Padding="4">
     <!-- Information Page -->
     <TabItem>
       <TabItem.Header>
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
@@ -1,10 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.IO;
+
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.LogicalTree;
 using Avalonia.Platform.Storage;
-using SourceGit.ViewModels;
 
 namespace SourceGit.Views
 {
@@ -15,7 +16,7 @@ public CommitDetail()
             InitializeComponent();
         }
 
-        public ContextMenu CreateChangeContextMenuByFolder(ChangeTreeNode node, List<Models.Change> changes)
+        public ContextMenu CreateChangeContextMenuByFolder(ViewModels.ChangeTreeNode node, List<Models.Change> changes)
         {
             if (DataContext is not ViewModels.CommitDetail { Repository: { } repo, Commit: { } commit } vm)
                 return null;
@@ -335,7 +336,10 @@ private void OnChangeDoubleTapped(object sender, TappedEventArgs e)
         {
             if (DataContext is ViewModels.CommitDetail detail && sender is Grid { DataContext: Models.Change change })
             {
-                detail.ActivePageIndex = 1;
+                var tabControl = this.FindLogicalDescendantOfType<TabControl>();
+                if (tabControl != null)
+                    tabControl.SelectedIndex = 1;
+
                 detail.SelectedChanges = new() { change };
             }
 
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
@@ -46,7 +46,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.General}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.General.Locale}"
                        HorizontalAlignment="Right"
@@ -136,28 +136,33 @@
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowChangesPageByDefault}"
                       IsChecked="{Binding ShowLocalChangesByDefault, Mode=TwoWay}"/>
-
+            
             <CheckBox Grid.Row="6" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preferences.General.ShowChangesTabInCommitDetailByDefault}"
+                      IsChecked="{Binding ShowChangesInCommitDetailByDefault, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowAuthorTime}"
                       IsChecked="{Binding ShowAuthorTimeInGraph, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="7" Grid.Column="1"
+            <CheckBox Grid.Row="8" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowTagsInGraph}"
                       IsChecked="{Binding ShowTagsInGraph, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="8" Grid.Column="1"
+            <CheckBox Grid.Row="9" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowChildren}"
                       IsChecked="{Binding ShowChildren, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="9" Grid.Column="1"
+            <CheckBox Grid.Row="10" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.EnableCompactFolders}"
                       IsChecked="{Binding EnableCompactFoldersInChangesTree, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="10" Grid.Column="1"
+            <CheckBox Grid.Row="11" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
                       IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"

Original file line number	Diff line number	Diff line change
`@@ -10,24 +10,34 @@`
`10`	`10`
`11`	`11`	`namespace SourceGit.ViewModels`
`12`	`12`	`{`
	`13`	`+ public class CommitDetailSharedData`
	`14`	`+ {`
	`15`	`+ public int ActiveTabIndex`
	`16`	`+ {`
	`17`	`+ get;`
	`18`	`+ set;`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ public CommitDetailSharedData()`
	`22`	`+ {`
	`23`	`+ ActiveTabIndex = Preferences.Instance.ShowChangesInCommitDetailByDefault ? 1 : 0;`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+`
`13`	`27`	`public partial class CommitDetail : ObservableObject, IDisposable`
`14`	`28`	`{`
`15`	`29`	`public Repository Repository`
`16`	`30`	`{`
`17`	`31`	`get => _repo;`
`18`	`32`	`}`
`19`	`33`
`20`		`- public int ActivePageIndex`
	`34`	`+ public int ActiveTabIndex`
`21`	`35`	`{`
`22`		`- get => _rememberActivePageIndex ? _repo.CommitDetailActivePageIndex : _activePageIndex;`
	`36`	`+ get => _sharedData.ActiveTabIndex;`
`23`	`37`	`set`
`24`	`38`	`{`
`25`		`- if (_rememberActivePageIndex)`
`26`		`- _repo.CommitDetailActivePageIndex = value;`
`27`		`- else`
`28`		`- _activePageIndex = value;`
`29`		`-`
`30`		`- OnPropertyChanged();`
	`39`	`+ if (value != _sharedData.ActiveTabIndex)`
	`40`	`+ _sharedData.ActiveTabIndex = value;`
`31`	`41`	`}`
`32`	`42`	`}`
`33`	`43`
`@@ -142,10 +152,10 @@ public bool CanOpenRevisionFileWithDefaultEditor`
`142`	`152`	`private set => SetProperty(ref _canOpenRevisionFileWithDefaultEditor, value);`
`143`	`153`	`}`
`144`	`154`
`145`		`- public CommitDetail(Repository repo, bool rememberActivePageIndex)`
	`155`	`+ public CommitDetail(Repository repo, CommitDetailSharedData sharedData)`
`146`	`156`	`{`
`147`	`157`	`_repo = repo;`
`148`		`- _rememberActivePageIndex = rememberActivePageIndex;`
	`158`	`+ _sharedData = sharedData ?? new CommitDetailSharedData();`
`149`	`159`	`WebLinks = Models.CommitLink.Get(repo.Remotes);`
`150`	`160`	`}`
`151`	`161`
`@@ -569,8 +579,7 @@ private async Task SetViewingCommitAsync(Models.Object file)`
`569`	`579`	`private static partial Regex REG_SHA_FORMAT();`
`570`	`580`
`571`	`581`	`private Repository _repo = null;`
`572`		`- private bool _rememberActivePageIndex = true;`
`573`		`- private int _activePageIndex = 0;`
	`582`	`+ private CommitDetailSharedData _sharedData = null;`
`574`	`583`	`private Models.Commit _commit = null;`
`575`	`584`	`private Models.CommitFullMessage _fullMessage = null;`
`576`	`585`	`private Models.CommitSignInfo _signInfo = null;`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public GridLength BottomArea`
`89`	`89`	`public Histories(Repository repo)`
`90`	`90`	`{`
`91`	`91`	`_repo = repo;`
	`92`	`+ _commitDetailSharedData = new CommitDetailSharedData();`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`public void Dispose()`
`@@ -173,7 +174,7 @@ public void Select(IList commits)`
`173`	`174`	`}`
`174`	`175`	`else`
`175`	`176`	`{`
`176`		`- var commitDetail = new CommitDetail(_repo, true);`
	`177`	`+ var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);`
`177`	`178`	`commitDetail.Commit = commit;`
`178`	`179`	`DetailContext = commitDetail;`
`179`	`180`	`}`
`@@ -392,14 +393,15 @@ private void NavigateTo(Models.Commit commit)`
`392`	`393`	`}`
`393`	`394`	`else`
`394`	`395`	`{`
`395`		`- var commitDetail = new CommitDetail(_repo, true);`
	`396`	`+ var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);`
`396`	`397`	`commitDetail.Commit = commit;`
`397`	`398`	`DetailContext = commitDetail;`
`398`	`399`	`}`
`399`	`400`	`}`
`400`	`401`	`}`
`401`	`402`
`402`	`403`	`private Repository _repo = null;`
	`404`	`+ private CommitDetailSharedData _commitDetailSharedData = null;`
`403`	`405`	`private bool _isLoading = true;`
`404`	`406`	`private List<Models.Commit> _commits = new List<Models.Commit>();`
`405`	`407`	`private Models.CommitGraph _graph = null;`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public object Detail`
`122`	`122`	`public InteractiveRebase(Repository repo, Models.Commit on, InteractiveRebasePrefill prefill = null)`
`123`	`123`	`{`
`124`	`124`	`_repo = repo;`
`125`		`- _commitDetail = new CommitDetail(repo, false);`
	`125`	`+ _commitDetail = new CommitDetail(repo, null);`
`126`	`126`	`Current = repo.CurrentBranch;`
`127`	`127`	`On = on;`
`128`	`128`	`IsLoading = true;`
Original file line number	Diff line number	Diff line change
`@@ -472,12 +472,6 @@ public bool IsAutoFetching`
`472`	`472`	`private set => SetProperty(ref _isAutoFetching, value);`
`473`	`473`	`}`
`474`	`474`
`475`		`- public int CommitDetailActivePageIndex`
`476`		`- {`
`477`		`- get;`
`478`		`- set;`
`479`		`- } = 0;`
`480`		`-`
`481`	`475`	`public AvaloniaList<Models.IssueTracker> IssueTrackers`
`482`	`476`	`{`
`483`	`477`	`get;`