@@ -460,36 +460,39 @@ public async Task GotoChild()
460460 }
461461 }
462462
463+ private double SubjectColumnRight => CommitListContainer . Columns [ 1 ] . ActualWidth +
464+ ( CommitListContainer . Columns [ 0 ] . IsVisible ? CommitListContainer . Columns [ 0 ] . ActualWidth : 0 ) ;
465+
463466 protected override void OnDataContextChanged ( EventArgs e )
464467 {
465468 base . OnDataContextChanged ( e ) ;
466469
467470 if ( DataContext is ViewModels . Histories vm )
468- CommitListContainer . Columns [ 1 ] . Width = new ( vm . AuthorColumnWidth , DataGridLengthUnitType . Pixel ) ;
471+ CommitListContainer . Columns [ 2 ] . Width = new ( vm . AuthorColumnWidth , DataGridLengthUnitType . Pixel ) ;
469472 }
470473
471474 private void OnCommitListHeaderPointerMoved ( object sender , PointerEventArgs e )
472475 {
473476 if ( sender is not Border border )
474477 return ;
475478
476- if ( DataContext is not ViewModels . Histories { IsAuthorColumnVisible : true } vm )
479+ if ( DataContext is not ViewModels . Histories vm )
477480 return ;
478481
479482 var pos = e . GetPosition ( border ) ;
480483 if ( _resizingAuthorColumn )
481484 {
482- var posX = CommitListContainer . Columns [ 0 ] . ActualWidth ;
483- var maxW = posX + CommitListContainer . Columns [ 1 ] . ActualWidth - 100 ;
485+ var posX = SubjectColumnRight ;
486+ var maxW = posX + CommitListContainer . Columns [ 2 ] . ActualWidth - 100 ;
484487 var delta = posX - pos . X ;
485488 var w = Math . Max ( Math . Min ( vm . AuthorColumnWidth + delta , maxW ) , 80 ) ;
486- CommitListContainer . Columns [ 1 ] . Width = new ( w , DataGridLengthUnitType . Pixel ) ;
489+ CommitListContainer . Columns [ 2 ] . Width = new ( w , DataGridLengthUnitType . Pixel ) ;
487490 vm . AuthorColumnWidth = w ;
488491 }
489492 else
490493 {
491- var dis = CommitListContainer . Columns [ 0 ] . ActualWidth - 4 - pos . X ;
492- if ( dis < 4 && dis > - 4 )
494+ var nearAuthorEdge = vm . IsAuthorColumnVisible && Math . Abs ( SubjectColumnRight - 4 - pos . X ) < 4 ;
495+ if ( nearAuthorEdge )
493496 {
494497 if ( border . Cursor != _resizingCursor )
495498 border . Cursor = _resizingCursor ;
@@ -506,19 +509,30 @@ private void OnCommitListHeaderPointerPressed(object sender, PointerPressedEvent
506509 if ( sender is not Border border )
507510 return ;
508511
509- var pos = e . GetPosition ( border ) ;
510- var dis = CommitListContainer . Columns [ 0 ] . ActualWidth - 4 - pos . X ;
511- if ( dis > 4 || dis < - 4 )
512+ if ( DataContext is not ViewModels . Histories vm || ! e . GetCurrentPoint ( border ) . Properties . IsLeftButtonPressed )
512513 return ;
513514
514- if ( e . GetCurrentPoint ( border ) . Properties . IsLeftButtonPressed )
515+ var pos = e . GetPosition ( border ) ;
516+ if ( vm . IsAuthorColumnVisible && Math . Abs ( SubjectColumnRight - 4 - pos . X ) < 4 )
515517 {
516518 _resizingAuthorColumn = true ;
517- e . Handled = true ;
518519 }
520+ else
521+ {
522+ return ;
523+ }
524+
525+ e . Pointer . Capture ( border ) ;
526+ e . Handled = true ;
519527 }
520528
521529 private void OnCommitListHeaderPointerReleased ( object sender , PointerReleasedEventArgs e )
530+ {
531+ _resizingAuthorColumn = false ;
532+ e . Pointer . Capture ( null ) ;
533+ }
534+
535+ private void OnCommitListHeaderPointerCaptureLost ( object sender , PointerCaptureLostEventArgs e )
522536 {
523537 _resizingAuthorColumn = false ;
524538 }
@@ -679,6 +693,16 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
679693 columnsHeader . Header = new TextBlock ( ) { Text = App . Text ( "Histories.ShowColumns" ) , FontWeight = FontWeight . Bold } ;
680694 columnsHeader . IsEnabled = false ;
681695
696+ var treeColumn = new MenuItem ( ) ;
697+ treeColumn . Header = App . Text ( "Histories.Header.Tree" ) ;
698+ if ( histories . IsTreeColumnVisible )
699+ treeColumn . Icon = this . CreateMenuIcon ( "Icons.Check" ) ;
700+ treeColumn . Click += ( _ , ev ) =>
701+ {
702+ histories . IsTreeColumnVisible = ! histories . IsTreeColumnVisible ;
703+ ev . Handled = true ;
704+ } ;
705+
682706 var authorColumn = new MenuItem ( ) ;
683707 authorColumn . Header = App . Text ( "Histories.Header.Author" ) ;
684708 if ( histories . IsAuthorColumnVisible )
@@ -742,6 +766,7 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
742766 menu . Items . Add ( currentBranchAndSelectedCommits ) ;
743767 menu . Items . Add ( new MenuItem ( ) { Header = "-" } ) ;
744768 menu . Items . Add ( columnsHeader ) ;
769+ menu . Items . Add ( treeColumn ) ;
745770 menu . Items . Add ( authorColumn ) ;
746771 menu . Items . Add ( shaColumn ) ;
747772 menu . Items . Add ( authorTimeColumn ) ;
@@ -761,12 +786,18 @@ private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
761786
762787 double rowHeight = dataGrid . RowHeight ;
763788 double startY = 0 ;
789+ // The header must not add space beyond the visible graph lanes.
790+ double treeWidth = 0 ;
764791 foreach ( var child in rowsPresenter . Children )
765792 {
766793 if ( child is DataGridRow { IsVisible : true } row )
767794 {
768795 rowHeight = row . Bounds . Height ;
769796
797+ if ( row . Bounds . Bottom > 0 && row . Bounds . Top < rowsPresenter . Bounds . Height &&
798+ row . DataContext is Models . Commit commit )
799+ treeWidth = Math . Max ( treeWidth , commit . LeftMargin + 4 ) ;
800+
770801 if ( row . Bounds . Top <= 0 && row . Bounds . Top > - rowHeight )
771802 {
772803 var test = rowHeight * row . Index - row . Bounds . Top ;
@@ -778,7 +809,11 @@ private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
778809
779810 IsScrollToTopVisible = startY >= rowHeight ;
780811
781- var clipWidth = dataGrid . Columns [ 0 ] . ActualWidth - 4 ;
812+ var graphColumn = DataContext is ViewModels . Histories { IsTreeColumnVisible : true } ? 0 : 1 ;
813+ if ( graphColumn == 0 && Math . Abs ( dataGrid . Columns [ 0 ] . Width . Value - treeWidth ) > 0.01 )
814+ dataGrid . Columns [ 0 ] . Width = new ( treeWidth , DataGridLengthUnitType . Pixel ) ;
815+
816+ var clipWidth = Math . Max ( 0 , dataGrid . Columns [ graphColumn ] . ActualWidth - 4 ) ;
782817 var lastLayout = CommitGraph . Layout ;
783818 if ( lastLayout == null ||
784819 Math . Abs ( lastLayout . StartY - startY ) > 0.01 ||
0 commit comments