ux: when the repository only has one remote, hide the remote name in compact decorator

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

Author: love-linger

src/ViewModels/Histories.cs

@@ -129,7 +129,14 @@ public Models.Bisect Bisect
 
         public Models.Branch CurrentBranch
         {
-            get => _repo.CurrentBranch;
+            get => _currentBranch;
+            set => SetProperty(ref _currentBranch, value);
+        }
+
+        public bool HasSingleRemote
+        {
+            get => _hasSingleRemote;
+            set => SetProperty(ref _hasSingleRemote, value);
         }
 
         public AvaloniaList<Models.IssueTracker> IssueTrackers
@@ -195,11 +202,6 @@ public Histories(Repository repo)
             _commitDetailSharedData = new CommitDetailSharedData();
         }
 
-        public void NotifyCurrentBranchChanged()
-        {
-            OnPropertyChanged(nameof(CurrentBranch));
-        }
-
         public Models.BisectState UpdateBisectInfo()
         {
             var test = Path.Combine(_repo.GitDir, "BISECT_START");
@@ -526,6 +528,8 @@ private void GenerateGraph(List<Models.Commit> commits)
         }
 
         private Repository _repo = null;
+        private Models.Branch _currentBranch = null;
+        private bool _hasSingleRemote = false;
         private CommitDetailSharedData _commitDetailSharedData = null;
         private bool _isLoading = true;
         private List<Models.Commit> _commits = [];

src/ViewModels/Repository.cs

@@ -158,7 +158,14 @@ public string Filter
         public List<Models.Remote> Remotes
         {
             get => _remotes;
-            private set => SetProperty(ref _remotes, value);
+            private set
+            {
+                if (SetProperty(ref _remotes, value))
+                {
+                    if (_histories != null)
+                        _histories.HasSingleRemote = value != null && value.Count == 1;
+                }
+            }
         }
 
         public List<Models.Branch> Branches
@@ -175,7 +182,9 @@ private set
                 var oldHead = _currentBranch?.Head;
                 if (SetProperty(ref _currentBranch, value))
                 {
-                    _histories?.NotifyCurrentBranchChanged();
+                    if (_histories != null)
+                        _histories.CurrentBranch = value;
+
                     if (value != null && !value.Head.Equals(oldHead, StringComparison.Ordinal) && _workingCopy is { UseAmend: true })
                         _workingCopy.UseAmend = false;
                 }

src/Views/CommitRefsPresenter.cs

@@ -121,6 +121,15 @@ public bool UseCompactBranchNames
             set => SetValue(UseCompactBranchNamesProperty, value);
         }
 
+        public static readonly StyledProperty<bool> HasSingleRemoteProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(HasSingleRemote));
+
+        public bool HasSingleRemote
+        {
+            get => GetValue(HasSingleRemoteProperty);
+            set => SetValue(HasSingleRemoteProperty, value);
+        }
+
         public static readonly StyledProperty<bool> UseGraphColorProperty =
             AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(UseGraphColor));
 
@@ -173,6 +182,7 @@ public override void Render(DrawingContext context)
             var x = 1.5;
             var y = 0.5;
             var remoteIcon = CommitRefsIconCache.Instance.GetIcon(Models.DecoratorType.RemoteBranchHead);
+            var hasSingleRemote = HasSingleRemote;
 
             context.FillRectangle(Brushes.Transparent, Bounds);
 
@@ -212,13 +222,23 @@ public override void Render(DrawingContext context)
                 if (item.Remotes.Count > 0)
                 {
                     var rx = x + 20 + item.Label.WidthIncludingTrailingWhitespace + 4;
-                    foreach (var remote in item.Remotes)
+
+                    if (hasSingleRemote)
                     {
                         context.DrawLine(new Pen(item.Brush), new Point(rx, y), new Point(rx, y + 16));
                         using (context.PushTransform(Matrix.CreateTranslation(rx + 4, y + 4)))
                             context.DrawGeometry(fg, null, remoteIcon);
-                        context.DrawText(remote, new Point(rx + 16, y + 8.0 - remote.Height * 0.5));
-                        rx += remote.WidthIncludingTrailingWhitespace + 22;
+                    }
+                    else
+                    {
+                        foreach (var remote in item.Remotes)
+                        {
+                            context.DrawLine(new Pen(item.Brush), new Point(rx, y), new Point(rx, y + 16));
+                            using (context.PushTransform(Matrix.CreateTranslation(rx + 4, y + 4)))
+                                context.DrawGeometry(fg, null, remoteIcon);
+                            context.DrawText(remote, new Point(rx + 16, y + 8.0 - remote.Height * 0.5));
+                            rx += remote.WidthIncludingTrailingWhitespace + 22;
+                        }
                     }
                 }
 
@@ -268,6 +288,7 @@ protected override Size MeasureOverride(Size availableSize)
             }
 
             var useCompactBranchNames = UseCompactBranchNames;
+            var hasSingleRemote = HasSingleRemote;
             var typeface = new Typeface(FontFamily);
             var typefaceHead = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
             var typefaceRemote = new Typeface(FontFamily, FontStyle.Italic, FontWeight.Bold);
@@ -345,7 +366,12 @@ protected override Size MeasureOverride(Size availableSize)
                                 fg);
 
                             item.Remotes.Add(remote);
-                            item.Width += remote.WidthIncludingTrailingWhitespace + 22;
+
+                            if (hasSingleRemote)
+                                item.Width += 18;
+                            else
+                                item.Width += remote.WidthIncludingTrailingWhitespace + 22;
+
                             skippedIdx.Add(j);
                         }
                     }

src/Views/Histories.axaml

@@ -127,7 +127,8 @@
                                            FontSize="12"
                                            VerticalAlignment="Center"
                                            UseGraphColor="{Binding IsHighlightedInGraph, Mode=OneWay}"
-                                           UseCompactBranchNames="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseCompactBranchNamesInGraph}"/>
+                                           UseCompactBranchNames="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseCompactBranchNamesInGraph}"
+                                           HasSingleRemote="{Binding $parent[v:Histories].HasSingleRemote}"/>
 
                     <v:CommitSubjectPresenter Grid.Column="3"
                                               Height="26"

src/Views/Histories.axaml.cs

@@ -321,6 +321,18 @@ public Models.Bisect Bisect
             set => SetAndRaise(BisectProperty, ref _bisect, value);
         }
 
+        public static readonly DirectProperty<Histories, bool> HasSingleRemoteProperty =
+            AvaloniaProperty.RegisterDirect<Histories, bool>(
+                nameof(HasSingleRemote),
+                static o => o.HasSingleRemote,
+                static (o, v) => o.HasSingleRemote = v);
+
+        public bool HasSingleRemote
+        {
+            get => _hasSingleRemote;
+            set => SetAndRaise(HasSingleRemoteProperty, ref _hasSingleRemote, value);
+        }
+
         public static readonly DirectProperty<Histories, AvaloniaList<Models.IssueTracker>> IssueTrackersProperty =
             AvaloniaProperty.RegisterDirect<Histories, AvaloniaList<Models.IssueTracker>>(
                 nameof(IssueTrackers),
@@ -1734,9 +1746,9 @@ private async Task InteractiveRebaseWithPrefillActionAsync(ViewModels.Repository
                 await this.ShowDialogAsync(new ViewModels.InteractiveRebase(repo, on, prefill));
         }
 
-
         private Models.Branch _currentBranch = null;
         private Models.Bisect _bisect = null;
+        private bool _hasSingleRemote = false;
         private AvaloniaList<Models.IssueTracker> _issueTrackers = null;
         private bool _isScrollToTopVisible = false;
         private bool _isDetailsPanelExpanded = true;

src/Views/Repository.axaml

@@ -1013,6 +1013,7 @@
           <v:Histories DataContext="{Binding Histories, Mode=OneWay}"
                        CurrentBranch="{Binding CurrentBranch, Mode=OneWay}"
                        Bisect="{Binding Bisect, Mode=OneWay}"
+                       HasSingleRemote="{Binding HasSingleRemote, Mode=OneWay}"
                        IssueTrackers="{Binding IssueTrackers, Mode=OneWay}">
             <v:Histories.IsDetailsPanelExpanded>
               <MultiBinding Converter="{x:Static BoolConverters.Or}">