fix: bounds not updated after left side bar layout updated

Author: love-linger

src/Views/BranchTree.axaml

@@ -10,13 +10,11 @@
              x:Name="ThisControl">
   <DataGrid x:Name="BranchesPresenter"
             ItemsSource="{Binding #ThisControl.Rows}"
-            Height="{Binding #ThisControl.Height}"
             Background="Transparent"
             RowHeight="24"
             CanUserReorderColumns="False"
             CanUserResizeColumns="False"
             CanUserSortColumns="False"
-            HorizontalAlignment="Stretch"
             HorizontalScrollBarVisibility="Disabled"
             VerticalScrollBarVisibility="Auto"
             HeadersVisibility="None"
@@ -48,27 +46,27 @@
         <Setter Property="Opacity" Value=".8"/>
       </Style>
     </DataGrid.Styles>
-    
+
     <DataGrid.Columns>
       <DataGridTemplateColumn Width="*">
         <DataGridTemplateColumn.CellTemplate>
           <DataTemplate x:DataType="vm:BranchTreeNode">
             <Grid Height="24"
-                  Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}" 
-                  ColumnDefinitions="16,20,*,Auto,Auto" 
-                  Background="Transparent" 
-                  DoubleTapped="OnDoubleTappedBranchNode" 
+                  Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
+                  ColumnDefinitions="16,20,*,Auto,Auto"
+                  Background="Transparent"
+                  DoubleTapped="OnDoubleTappedBranchNode"
                   ToolTip.Tip="{Binding Tooltip}">
-              
+
               <!-- Tree Expander -->
-              <ToggleButton Grid.Column="0" 
+              <ToggleButton Grid.Column="0"
                             Classes="tree_expander"
                             Focusable="False"
                             HorizontalAlignment="Center"
                             IsChecked="{Binding IsExpanded}"
                             IsHitTestVisible="False"
                             IsVisible="{Binding !IsBranch}"/>
-              
+
               <!-- Icon -->
               <v:BranchTreeNodeIcon Grid.Column="1"
                                     Node="{Binding}"
@@ -79,14 +77,14 @@
                          Text="{Binding Name}"
                          Classes="monospace"
                          FontWeight="{Binding NameFontWeight}"/>
-              
+
               <!-- Tracking status -->
-              <Border Grid.Column="3" 
-                      Margin="8,0" 
-                      Height="18" 
-                      CornerRadius="9" 
-                      VerticalAlignment="Center" 
-                      Background="{DynamicResource Brush.Badge}" 
+              <Border Grid.Column="3"
+                      Margin="8,0"
+                      Height="18"
+                      CornerRadius="9"
+                      VerticalAlignment="Center"
+                      Background="{DynamicResource Brush.Badge}"
                       IsVisible="{Binding IsUpstreamTrackStatusVisible}">
                 <TextBlock Classes="monospace" FontSize="10" HorizontalAlignment="Center" Margin="9,0" Text="{Binding UpstreamTrackStatus}" Foreground="{DynamicResource Brush.BadgeFG}"/>
               </Border>

src/Views/BranchTree.axaml.cs

@@ -113,6 +113,15 @@ public event EventHandler<RoutedEventArgs> SelectionChanged
             remove { RemoveHandler(SelectionChangedEvent, value); }
         }
 
+        public static readonly RoutedEvent<RoutedEventArgs> RowsChangedEvent =
+            RoutedEvent.Register<BranchTree, RoutedEventArgs>(nameof(RowsChanged), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        public event EventHandler<RoutedEventArgs> RowsChanged
+        {
+            add { AddHandler(RowsChangedEvent, value); }
+            remove { RemoveHandler(RowsChangedEvent, value); }
+        }
+
         public BranchTree()
         {
             InitializeComponent();
@@ -123,6 +132,14 @@ public void UnselectAll()
             BranchesPresenter.SelectedItem = null;
         }
 
+        protected override void OnSizeChanged(SizeChangedEventArgs e)
+        {
+            base.OnSizeChanged(e);
+
+            if (Bounds.Height >= 23.0)
+                BranchesPresenter.Height = Bounds.Height;
+        }
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
@@ -138,18 +155,20 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                     Rows.AddRange(rows);
                 }
 
-                var repo = this.FindAncestorOfType<Repository>();
-                repo?.UpdateLeftSidebarLayout();
+                RaiseEvent(new RoutedEventArgs(RowsChangedEvent));
             }
             else if (change.Property == IsVisibleProperty)
             {
-                var repo = this.FindAncestorOfType<Repository>();
-                repo?.UpdateLeftSidebarLayout();
+                RaiseEvent(new RoutedEventArgs(RowsChangedEvent));
             }
         }
 
         private void OnNodesSelectionChanged(object _, SelectionChangedEventArgs e)
         {
+            var repo = DataContext as ViewModels.Repository;
+            if (repo?.Settings == null)
+                return;
+
             foreach (var item in e.AddedItems)
             {
                 if (item is ViewModels.BranchTreeNode node)
@@ -167,10 +186,7 @@ private void OnNodesSelectionChanged(object _, SelectionChangedEventArgs e)
                 return;
 
             if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Branch branch })
-            {
-                var repo = DataContext as ViewModels.Repository;
-                repo?.NavigateToCommit(branch.Head);
-            }
+                repo.NavigateToCommit(branch.Head);
 
             var prev = null as ViewModels.BranchTreeNode;
             foreach (var row in Rows)
@@ -285,8 +301,7 @@ private void OnDoubleTappedBranchNode(object sender, TappedEventArgs _)
                         rows.RemoveRange(idx + 1, removeCount);
                     }
 
-                    var repo = this.FindAncestorOfType<Repository>();
-                    repo?.UpdateLeftSidebarLayout();
+                    RaiseEvent(new RoutedEventArgs(RowsChangedEvent));
                 }
             }
         }

src/Views/Repository.axaml

@@ -241,7 +241,8 @@
                           Margin="8,0,4,0"
                           Nodes="{Binding LocalBranchTrees}"
                           IsVisible="{Binding IsLocalBranchGroupExpanded}"
-                          SelectionChanged="OnLocalBranchTreeSelectionChanged"/>
+                          SelectionChanged="OnLocalBranchTreeSelectionChanged"
+                          RowsChanged="OnBranchTreeRowsChanged"/>
 
             <!-- Remotes -->
             <ToggleButton Grid.Row="2" Classes="group_expander" IsChecked="{Binding IsRemoteGroupExpanded, Mode=TwoWay}">
@@ -257,7 +258,8 @@
                           Margin="8,0,4,0"
                           Nodes="{Binding RemoteBranchTrees}"
                           IsVisible="{Binding IsRemoteGroupExpanded}"
-                          SelectionChanged="OnRemoteBranchTreeSelectionChanged"/>
+                          SelectionChanged="OnRemoteBranchTreeSelectionChanged"
+                          RowsChanged="OnBranchTreeRowsChanged"/>
 
             <!-- Tags -->
             <ToggleButton Grid.Row="4" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">