From e8c8ac55a14c73faf1bfce5dd74cf54911263124 Mon Sep 17 00:00:00 2001
From: "Dmitrij D. Czarkoff" <czarkoff@gmail.com>
Date: Tue, 19 Nov 2024 19:01:09 +0100
Subject: [PATCH] fix: hide children behind the preference

---
 src/Resources/Locales/en_US.axaml |  1 +
 src/ViewModels/CommitDetail.cs    | 15 +++++++++------
 src/ViewModels/Preference.cs      |  8 ++++++++
 src/Views/Preference.axaml        |  9 +++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index cb0bf568..462cdf90 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -452,6 +452,7 @@
   <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
   <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
   <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Show author time intead of commit time in graph</x:String>
+  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Show children in the comment details</x:String>
   <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
   <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Enable Auto CRLF</x:String>
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index a816d48a..6d819300 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -543,13 +543,16 @@ namespace SourceGit.ViewModels
 
             _cancelToken = new Commands.Command.CancelToken();
 
-            Task.Run(() =>
+            if (Preference.Instance.ShowChildren)
             {
-                var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, _repo.Settings.BuildHistoriesFilter()) { Cancel = _cancelToken };
-                var children = cmdChildren.Result();
-                if (!cmdChildren.Cancel.Requested)
-                    Dispatcher.UIThread.Post(() => Children.AddRange(children));
-            });
+                Task.Run(() =>
+                {
+                    var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, _repo.Settings.BuildHistoriesFilter()) { Cancel = _cancelToken };
+                    var children = cmdChildren.Result();
+                    if (!cmdChildren.Cancel.Requested)
+                        Dispatcher.UIThread.Post(() => Children.AddRange(children));
+                });
+            }
 
             Task.Run(() =>
             {
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index 68065df1..9d3de526 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -294,6 +294,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _statisticsSampleColor, value);
         }
 
+        public bool ShowChildren
+        {
+            get => _showChildren;
+            set => SetProperty(ref _showChildren, value);
+        }
+
         public List<RepositoryNode> RepositoryNodes
         {
             get;
@@ -617,5 +623,7 @@ namespace SourceGit.ViewModels
         private string _externalMergeToolPath = string.Empty;
 
         private uint _statisticsSampleColor = 0xFF00FF00;
+
+        private bool _showChildren = false;
     }
 }
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 9b84604a..0c7986ab 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -45,7 +45,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.General.Locale}"
                        HorizontalAlignment="Right"
@@ -114,6 +114,11 @@
                       Height="32"
                       Content="{DynamicResource Text.Preference.General.Check4UpdatesOnStartup}"
                       IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="6" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preference.General.ShowChildren}"
+                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowChildren, Mode=TwoWay}"/>
           </Grid>
         </TabItem>
 
@@ -188,7 +193,7 @@
                   </Border>
                 </NumericUpDown.InnerLeftContent>
               </NumericUpDown>
-            </Grid>            
+            </Grid>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.Appearance.ThemeOverrides}"