From 85278d348089402ccc2940ff03ba68b317b992f7 Mon Sep 17 00:00:00 2001
From: Tibor Prokai <tibor@kotem.com>
Date: Wed, 28 Oct 2026 12:18:16 +0100
Subject: [PATCH 1/2] feat: add optional resizable tree column in history

---
 src/Models/RepositoryUIStates.cs  |  6 +++
 src/Resources/Locales/en_US.axaml |  2 +
 src/ViewModels/Histories.cs       | 14 +++++++
 src/Views/Histories.axaml         | 38 +++++++++++++++++--
 src/Views/Histories.axaml.cs      | 61 ++++++++++++++++++++++++-------
 5 files changed, 105 insertions(+), 16 deletions(-)

diff --git a/src/Models/RepositoryUIStates.cs b/src/Models/RepositoryUIStates.cs
index 8657b93b65..6f43719c39 100644
--- a/src/Models/RepositoryUIStates.cs
+++ b/src/Models/RepositoryUIStates.cs
@@ -15,6 +15,12 @@ public HistoryShowFlags HistoryShowFlags
             set;
         } = HistoryShowFlags.None;
 
+        public bool IsTreeColumnVisibleInHistory
+        {
+            get;
+            set;
+        } = false;
+
         public bool IsAuthorColumnVisibleInHistory
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 1b1f29d8fb..e20939fcc4 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -526,6 +526,8 @@
   <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTHOR TIME</x:String>
   <x:String x:Key="Text.Histories.Header.CommitTime" xml:space="preserve">COMMIT TIME</x:String>
   <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPH &amp; SUBJECT</x:String>
+  <x:String x:Key="Text.Histories.Header.Subject" xml:space="preserve">SUBJECT</x:String>
+  <x:String x:Key="Text.Histories.Header.Tree" xml:space="preserve">TREE</x:String>
   <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.Histories.HighlightsInGraph" xml:space="preserve">HIGHLIGHTS IN GRAPH</x:String>
   <x:String x:Key="Text.Histories.HighlightsInGraph.All" xml:space="preserve">All</x:String>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 128b53ff9d..d44e2ff5a3 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -50,6 +50,19 @@ public bool EnableTopoOrder
             }
         }
 
+        public bool IsTreeColumnVisible
+        {
+            get => _repo.UIStates.IsTreeColumnVisibleInHistory;
+            set
+            {
+                if (_repo.UIStates.IsTreeColumnVisibleInHistory != value)
+                {
+                    _repo.UIStates.IsTreeColumnVisibleInHistory = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool IsAuthorColumnVisible
         {
             get => _repo.UIStates.IsAuthorColumnVisibleInHistory;
@@ -575,6 +588,7 @@ private void GenerateGraph(List<Models.Commit> commits)
             }
 
             Graph = Models.CommitGraph.Generate(commits, firstParentOnly, highlighting, extraHeads);
+
         }
 
         private Repository _repo = null;
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index a3d24529fd..ddb412e676 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -86,6 +86,13 @@
             </Style>
           </Style>
 
+          <Style Selector="Border.history_message" x:DataType="m:Commit">
+            <Setter Property="Padding" Value="{Binding LeftMargin, Converter={x:Static c:DoubleConverters.ToLeftMargin}}"/>
+          </Style>
+          <Style Selector="Border.history_message.separate_tree">
+            <Setter Property="Padding" Value="0"/>
+          </Style>
+
           <Style Selector="DataGridCell">
             <Setter Property="Template">
               <ControlTemplate>
@@ -103,16 +110,40 @@
         </DataGrid.Styles>
 
         <DataGrid.Columns>
+          <DataGridTemplateColumn Width="0" MinWidth="0"
+                                  IsReadOnly="True"
+                                  IsVisible="{Binding IsTreeColumnVisible, Mode=OneWay}">
+            <DataGridTemplateColumn.Header>
+              <Canvas Height="24" ClipToBounds="True">
+                <Border Canvas.Left="48" Height="24">
+                  <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.Tree}" VerticalAlignment="Center"/>
+                </Border>
+              </Canvas>
+            </DataGridTemplateColumn.Header>
+            <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                <Border Background="Transparent"/>
+              </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+          </DataGridTemplateColumn>
+
           <DataGridTemplateColumn Width="*" IsReadOnly="True">
             <DataGridTemplateColumn.Header>
               <Border Padding="48,0">
-                <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
+                <Grid>
+                  <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"
+                             IsVisible="{Binding !IsTreeColumnVisible}"/>
+                  <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.Subject}" HorizontalAlignment="Center"
+                             IsVisible="{Binding IsTreeColumnVisible}"/>
+                </Grid>
               </Border>
             </DataGridTemplateColumn.Header>
 
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate DataType="m:Commit">
-                <Border Padding="{Binding LeftMargin, Converter={x:Static c:DoubleConverters.ToLeftMargin}}" ClipToBounds="True" Background="Transparent">
+                <Border Classes="history_message"
+                        Classes.separate_tree="{Binding $parent[v:Histories].((vm:Histories)DataContext).IsTreeColumnVisible}"
+                        ClipToBounds="True" Background="Transparent">
                   <Grid ColumnDefinitions="Auto,Auto,Auto,*" Margin="2,0,4,0" ClipToBounds="True">
                     <v:CommitStatusIndicator Grid.Column="0"
                                              CurrentBranch="{Binding $parent[v:Histories].CurrentBranch}"
@@ -247,7 +278,8 @@
               HorizontalAlignment="Stretch" VerticalAlignment="Top"
               PointerMoved="OnCommitListHeaderPointerMoved"
               PointerPressed="OnCommitListHeaderPointerPressed"
-              PointerReleased="OnCommitListHeaderPointerReleased">
+              PointerReleased="OnCommitListHeaderPointerReleased"
+              PointerCaptureLost="OnCommitListHeaderPointerCaptureLost">
         <StackPanel Orientation="Horizontal"
                     Height="18"
                     Margin="4,0,0,0"
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 846c59d1b1..3f3f156e03 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -460,12 +460,15 @@ public async Task GotoChild()
             }
         }
 
+        private double SubjectColumnRight => CommitListContainer.Columns[1].ActualWidth +
+            (CommitListContainer.Columns[0].IsVisible ? CommitListContainer.Columns[0].ActualWidth : 0);
+
         protected override void OnDataContextChanged(EventArgs e)
         {
             base.OnDataContextChanged(e);
 
             if (DataContext is ViewModels.Histories vm)
-                CommitListContainer.Columns[1].Width = new(vm.AuthorColumnWidth, DataGridLengthUnitType.Pixel);
+                CommitListContainer.Columns[2].Width = new(vm.AuthorColumnWidth, DataGridLengthUnitType.Pixel);
         }
 
         private void OnCommitListHeaderPointerMoved(object sender, PointerEventArgs e)
@@ -473,23 +476,23 @@ private void OnCommitListHeaderPointerMoved(object sender, PointerEventArgs e)
             if (sender is not Border border)
                 return;
 
-            if (DataContext is not ViewModels.Histories { IsAuthorColumnVisible: true } vm)
+            if (DataContext is not ViewModels.Histories vm)
                 return;
 
             var pos = e.GetPosition(border);
             if (_resizingAuthorColumn)
             {
-                var posX = CommitListContainer.Columns[0].ActualWidth;
-                var maxW = posX + CommitListContainer.Columns[1].ActualWidth - 100;
+                var posX = SubjectColumnRight;
+                var maxW = posX + CommitListContainer.Columns[2].ActualWidth - 100;
                 var delta = posX - pos.X;
                 var w = Math.Max(Math.Min(vm.AuthorColumnWidth + delta, maxW), 80);
-                CommitListContainer.Columns[1].Width = new(w, DataGridLengthUnitType.Pixel);
+                CommitListContainer.Columns[2].Width = new(w, DataGridLengthUnitType.Pixel);
                 vm.AuthorColumnWidth = w;
             }
             else
             {
-                var dis = CommitListContainer.Columns[0].ActualWidth - 4 - pos.X;
-                if (dis < 4 && dis > -4)
+                var nearAuthorEdge = vm.IsAuthorColumnVisible && Math.Abs(SubjectColumnRight - 4 - pos.X) < 4;
+                if (nearAuthorEdge)
                 {
                     if (border.Cursor != _resizingCursor)
                         border.Cursor = _resizingCursor;
@@ -506,19 +509,30 @@ private void OnCommitListHeaderPointerPressed(object sender, PointerPressedEvent
             if (sender is not Border border)
                 return;
 
-            var pos = e.GetPosition(border);
-            var dis = CommitListContainer.Columns[0].ActualWidth - 4 - pos.X;
-            if (dis > 4 || dis < -4)
+            if (DataContext is not ViewModels.Histories vm || !e.GetCurrentPoint(border).Properties.IsLeftButtonPressed)
                 return;
 
-            if (e.GetCurrentPoint(border).Properties.IsLeftButtonPressed)
+            var pos = e.GetPosition(border);
+            if (vm.IsAuthorColumnVisible && Math.Abs(SubjectColumnRight - 4 - pos.X) < 4)
             {
                 _resizingAuthorColumn = true;
-                e.Handled = true;
             }
+            else
+            {
+                return;
+            }
+
+            e.Pointer.Capture(border);
+            e.Handled = true;
         }
 
         private void OnCommitListHeaderPointerReleased(object sender, PointerReleasedEventArgs e)
+        {
+            _resizingAuthorColumn = false;
+            e.Pointer.Capture(null);
+        }
+
+        private void OnCommitListHeaderPointerCaptureLost(object sender, PointerCaptureLostEventArgs e)
         {
             _resizingAuthorColumn = false;
         }
@@ -679,6 +693,16 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
             columnsHeader.Header = new TextBlock() { Text = App.Text("Histories.ShowColumns"), FontWeight = FontWeight.Bold };
             columnsHeader.IsEnabled = false;
 
+            var treeColumn = new MenuItem();
+            treeColumn.Header = App.Text("Histories.Header.Tree");
+            if (histories.IsTreeColumnVisible)
+                treeColumn.Icon = this.CreateMenuIcon("Icons.Check");
+            treeColumn.Click += (_, ev) =>
+            {
+                histories.IsTreeColumnVisible = !histories.IsTreeColumnVisible;
+                ev.Handled = true;
+            };
+
             var authorColumn = new MenuItem();
             authorColumn.Header = App.Text("Histories.Header.Author");
             if (histories.IsAuthorColumnVisible)
@@ -742,6 +766,7 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
             menu.Items.Add(currentBranchAndSelectedCommits);
             menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(columnsHeader);
+            menu.Items.Add(treeColumn);
             menu.Items.Add(authorColumn);
             menu.Items.Add(shaColumn);
             menu.Items.Add(authorTimeColumn);
@@ -761,12 +786,18 @@ private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
 
             double rowHeight = dataGrid.RowHeight;
             double startY = 0;
+            // The header must not add space beyond the visible graph lanes.
+            double treeWidth = 0;
             foreach (var child in rowsPresenter.Children)
             {
                 if (child is DataGridRow { IsVisible: true } row)
                 {
                     rowHeight = row.Bounds.Height;
 
+                    if (row.Bounds.Bottom > 0 && row.Bounds.Top < rowsPresenter.Bounds.Height &&
+                        row.DataContext is Models.Commit commit)
+                        treeWidth = Math.Max(treeWidth, commit.LeftMargin + 4);
+
                     if (row.Bounds.Top <= 0 && row.Bounds.Top > -rowHeight)
                     {
                         var test = rowHeight * row.Index - row.Bounds.Top;
@@ -778,7 +809,11 @@ private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
 
             IsScrollToTopVisible = startY >= rowHeight;
 
-            var clipWidth = dataGrid.Columns[0].ActualWidth - 4;
+            var graphColumn = DataContext is ViewModels.Histories { IsTreeColumnVisible: true } ? 0 : 1;
+            if (graphColumn == 0 && Math.Abs(dataGrid.Columns[0].Width.Value - treeWidth) > 0.01)
+                dataGrid.Columns[0].Width = new(treeWidth, DataGridLengthUnitType.Pixel);
+
+            var clipWidth = Math.Max(0, dataGrid.Columns[graphColumn].ActualWidth - 4);
             var lastLayout = CommitGraph.Layout;
             if (lastLayout == null ||
                 Math.Abs(lastLayout.StartY - startY) > 0.01 ||

From 4f427bec0e0e16c5570ace044f768710b034bb82 Mon Sep 17 00:00:00 2001
From: Tibor Prokai <tibor@kotem.com>
Date: Wed, 28 Oct 2026 15:07:52 +0100
Subject: [PATCH 2/2] fix: center the tree column header

---
 src/Views/Histories.axaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index ddb412e676..d2ad0d38d2 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -115,8 +115,9 @@
                                   IsVisible="{Binding IsTreeColumnVisible, Mode=OneWay}">
             <DataGridTemplateColumn.Header>
               <Canvas Height="24" ClipToBounds="True">
-                <Border Canvas.Left="48" Height="24">
-                  <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.Tree}" VerticalAlignment="Center"/>
+                <Border Width="{Binding $parent[Canvas].Bounds.Width}" Height="24">
+                  <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.Tree}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </Border>
               </Canvas>
             </DataGridTemplateColumn.Header>