refactor: drop support to show children in commit details panel

Only support to go to child commit with `Alt+Up/⌥+Up` hotkey

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Commands/QueryCommitChildren.cs

@@ -184,7 +184,6 @@
   <x:String x:Key="Text.CommitDetail.Files.Submodule" xml:space="preserve">Submodule</x:String>
   <x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">INFORMATION</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTHOR</x:String>
-  <x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">CHILDREN</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Check refs that contains this commit</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT IS CONTAINED BY</x:String>
@@ -688,7 +687,6 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">History Commits</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.ShowRelativeTimeInGraph" xml:space="preserve">Show relative time in commit graph</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>

src/Resources/Locales/en_US.axaml

@@ -79,12 +79,6 @@ public List<Models.CommitLink> WebLinks
             private set;
         }
 
-        public List<string> Children
-        {
-            get => _children;
-            private set => SetProperty(ref _children, value);
-        }
-
         public List<Models.Change> Changes
         {
             get => _changes;
@@ -471,7 +465,6 @@ private void Refresh()
             ViewRevisionFileContent = null;
             ViewRevisionFilePath = string.Empty;
             CanOpenRevisionFileWithDefaultEditor = false;
-            Children = null;
             RevisionFileSearchFilter = string.Empty;
             RevisionFileSearchSuggestion = null;
             ScrollOffset = Vector.Zero;
@@ -518,20 +511,6 @@ private void Refresh()
                     Dispatcher.UIThread.Post(() => SignInfo = signInfo);
             }, token);
 
-            if (Preferences.Instance.ShowChildren)
-            {
-                Task.Run(async () =>
-                {
-                    var max = Preferences.Instance.MaxHistoryCommits;
-                    var children = await new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max)
-                        .WithCancellation(token)
-                        .GetResultAsync()
-                        .ConfigureAwait(false);
-                    if (!token.IsCancellationRequested)
-                        Dispatcher.UIThread.Post(() => Children = children);
-                }, token);
-            }
-
             Task.Run(async () =>
             {
                 var changes = await new Commands.CompareRevisions(_repo.FullPath, _commit.FirstParentToCompare, _commit.SHA)
@@ -757,7 +736,6 @@ private async Task SetViewingCommitAsync(Models.Object file)
         private Models.Commit _commit = null;
         private Models.CommitFullMessage _fullMessage = null;
         private Models.CommitSignInfo _signInfo = null;
-        private List<string> _children = null;
         private List<Models.Change> _changes = [];
         private List<Models.Change> _visibleChanges = [];
         private List<Models.Change> _selectedChanges = null;

src/ViewModels/CommitDetail.cs

@@ -193,12 +193,6 @@ public bool Check4UpdatesOnStartup
             set => SetProperty(ref _check4UpdatesOnStartup, value);
         }
 
-        public bool ShowChildren
-        {
-            get => _showChildren;
-            set => SetProperty(ref _showChildren, value);
-        }
-
         public string IgnoreUpdateTag
         {
             get => _ignoreUpdateTag;
@@ -812,7 +806,6 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private bool _useFixedTabWidth = true;
         private bool _useAutoHideScrollBars = true;
         private bool _useGitHubStyleAvatar = true;
-        private bool _showChildren = false;
         private bool _useCompactBranchNamesInGraph = true;
 
         private bool _check4UpdatesOnStartup = true;

src/ViewModels/Preferences.cs

@@ -59,7 +59,7 @@
         <Rectangle Height=".65" Margin="8,8,0,8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
 
         <!-- Base Information -->
-        <Grid RowDefinitions="24,Auto,Auto,Auto,Auto" ColumnDefinitions="96,*">
+        <Grid RowDefinitions="24,Auto,Auto,Auto" ColumnDefinitions="96,*">
           <!-- SHA -->
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
           <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24">
@@ -150,57 +150,9 @@
             </ItemsControl.ItemTemplate>
           </ItemsControl>
 
-          <!-- CHILDREN -->
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Children}" IsVisible="{Binding #ThisControl.Children, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
-          <ItemsControl Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" ItemsSource="{Binding #ThisControl.Children}" IsVisible="{Binding #ThisControl.Children, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
-            <ItemsControl.ItemsPanel>
-              <ItemsPanelTemplate>
-                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center" ItemHeight="24"/>
-              </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-
-            <ItemsControl.ItemTemplate>
-              <DataTemplate>
-                <TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
-                           FontFamily="{DynamicResource Fonts.Monospace}"
-                           Foreground="DarkOrange"
-                           TextDecorations="Underline"
-                           Cursor="Hand"
-                           Margin="0,0,16,0"
-                           PointerEntered="OnSHAPointerEntered"
-                           PointerPressed="OnSHAPressed"
-                           ToolTip.ShowDelay="0">
-                  <ToolTip.IsOpen>
-                    <MultiBinding Converter="{x:Static BoolConverters.And}">
-                      <Binding Path="$self.IsPointerOver"/>
-                      <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                    </MultiBinding>
-                  </ToolTip.IsOpen>
-
-                  <TextBlock.DataTemplates>
-                    <DataTemplate DataType="m:Commit">
-                      <StackPanel MinWidth="400" Orientation="Vertical">
-                        <Grid ColumnDefinitions="Auto,*,Auto">
-                          <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <v:DateTimePresenter Grid.Column="2"
-                                               Margin="8,0,0,0"
-                                               Timestamp="{Binding CommitterTime}"
-                                               Foreground="{DynamicResource Brush.FG2}"/>
-                        </Grid>
-
-                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                      </StackPanel>
-                    </DataTemplate>
-                  </TextBlock.DataTemplates>
-                </TextBlock>
-              </DataTemplate>
-            </ItemsControl.ItemTemplate>
-          </ItemsControl>
-
           <!-- REFS -->
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
-          <Border Grid.Row="3" Grid.Column="1" Margin="12,0,0,0" MinHeight="24" IsVisible="{Binding HasDecorators}">
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
+          <Border Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" MinHeight="24" IsVisible="{Binding HasDecorators}">
             <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
                                    FontSize="12"
                                    AllowWrap="True"
@@ -210,8 +162,8 @@
           </Border>
 
           <!-- Messages -->
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
-          <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
+          <v:CommitMessagePresenter Grid.Row="3" Grid.Column="1"
                                     Margin="12,4,0,0"
                                     Foreground="{DynamicResource Brush.FG1}"
                                     FullMessage="{Binding #ThisControl.FullMessage}"

src/Views/CommitBaseInfo.axaml

@@ -35,18 +35,6 @@ public Models.CommitSignInfo SignInfo
             set => SetAndRaise(SignInfoProperty, ref _signInfo, value);
         }
 
-        public static readonly DirectProperty<CommitBaseInfo, bool> SupportsContainsInProperty =
-            AvaloniaProperty.RegisterDirect<CommitBaseInfo, bool>(
-                nameof(SupportsContainsIn),
-                static o => o.SupportsContainsIn,
-                static (o, v) => o.SupportsContainsIn = v);
-
-        public bool SupportsContainsIn
-        {
-            get => _supportsContainsIn;
-            set => SetAndRaise(SupportsContainsInProperty, ref _supportsContainsIn, value);
-        }
-
         public static readonly DirectProperty<CommitBaseInfo, List<Models.CommitLink>> WebLinksProperty =
             AvaloniaProperty.RegisterDirect<CommitBaseInfo, List<Models.CommitLink>>(
                 nameof(WebLinks),
@@ -59,18 +47,6 @@ public List<Models.CommitLink> WebLinks
             set => SetAndRaise(WebLinksProperty, ref _webLinks, value);
         }
 
-        public static readonly DirectProperty<CommitBaseInfo, List<string>> ChildrenProperty =
-            AvaloniaProperty.RegisterDirect<CommitBaseInfo, List<string>>(
-                nameof(Children),
-                static o => o.Children,
-                static (o, v) => o.Children = v);
-
-        public List<string> Children
-        {
-            get => _children;
-            set => SetAndRaise(ChildrenProperty, ref _children, value);
-        }
-
         public static readonly DirectProperty<CommitBaseInfo, bool> IsSHACopiedProperty =
             AvaloniaProperty.RegisterDirect<CommitBaseInfo, bool>(
                 nameof(IsSHACopied),
@@ -79,14 +55,31 @@ public List<string> Children
         public bool IsSHACopied
         {
             get => _isSHACopied;
-            set => SetAndRaise(IsSHACopiedProperty, ref _isSHACopied, value);
+            private set => SetAndRaise(IsSHACopiedProperty, ref _isSHACopied, value);
+        }
+
+        public static readonly DirectProperty<CommitBaseInfo, bool> SupportsContainsInProperty =
+            AvaloniaProperty.RegisterDirect<CommitBaseInfo, bool>(
+                nameof(SupportsContainsIn),
+                static o => o.SupportsContainsIn);
+
+        public bool SupportsContainsIn
+        {
+            get => _supportsContainsIn;
+            private set => SetAndRaise(SupportsContainsInProperty, ref _supportsContainsIn, value);
         }
 
         public CommitBaseInfo()
         {
             InitializeComponent();
         }
 
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            SupportsContainsIn = DataContext is ViewModels.CommitDetail;
+        }
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
@@ -103,7 +96,7 @@ protected override void OnLoaded(RoutedEventArgs e)
             base.OnLoaded(e);
 
             _iconResetTimer = new DispatcherTimer();
-            _iconResetTimer.Interval = TimeSpan.FromSeconds(1.5);
+            _iconResetTimer.Interval = TimeSpan.FromSeconds(1);
             _iconResetTimer.Tag = this;
             _iconResetTimer.Tick += static (o, _) =>
             {
@@ -310,7 +303,6 @@ sender is CommitRefsPresenter presenter &&
         private Models.CommitSignInfo _signInfo = null;
         private bool _supportsContainsIn = false;
         private List<Models.CommitLink> _webLinks = null;
-        private List<string> _children = null;
         private bool _isSHACopied = false;
         private DispatcherTimer _iconResetTimer = null;
     }

src/Views/CommitBaseInfo.axaml.cs

@@ -28,9 +28,7 @@
           <v:CommitBaseInfo Content="{Binding Commit}"
                             FullMessage="{Binding FullMessage}"
                             SignInfo="{Binding SignInfo}"
-                            SupportsContainsIn="True"
                             WebLinks="{Binding WebLinks}"
-                            Children="{Binding Children}"
                             Margin="0,0,12,0"/>
 
           <!-- Line -->

src/Views/CommitDetail.axaml

@@ -47,7 +47,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,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,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"
@@ -162,26 +162,21 @@
                       IsChecked="{Binding DisplayTimeAsPeriodInHistories, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="9" Grid.Column="1"
-                      Height="32"
-                      Content="{DynamicResource Text.Preferences.General.ShowChildren}"
-                      IsChecked="{Binding ShowChildren, Mode=TwoWay}"/>
-
-            <CheckBox Grid.Row="10" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.UseCompactBranchNames}"
                       IsChecked="{Binding UseCompactBranchNamesInGraph, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="11" 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="12" Grid.Column="1"
+            <CheckBox Grid.Row="11" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.UseGitHubStyleAvatar}"
                       IsChecked="{Binding UseGitHubStyleAvatar, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="13" Grid.Column="1"
+            <CheckBox Grid.Row="12" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
                       IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"