enhance: add Views.CommitRefsPresenter to draw commit's decorators (refs) directly

src/ViewModels/Repository.cs

@@ -281,7 +281,7 @@ namespace SourceGit.ViewModels
 
         public void Close()
         {
-            SelectedView = 0.0; // Do NOT modify. Used to remove exists widgets for GC.Collect
+            SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect
 
             var settingsSerialized = JsonSerializer.Serialize(_settings, JsonCodeGen.Default.RepositorySettings);
             File.WriteAllText(Path.Combine(_gitDir, "sourcegit.settings"), settingsSerialized);

src/Views/CommitBaseInfo.axaml

@@ -78,30 +78,18 @@
           </ItemsControl>
 
           <!-- REFS -->
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding Decorators.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
-          <ItemsControl Grid.Row="2" Grid.Column="1" Height="24" Margin="12,0,0,0" ItemsSource="{Binding Decorators}" IsVisible="{Binding Decorators.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+          <Border Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" Height="24" IsVisible="{Binding HasDecorators}">
-            <ItemsControl.ItemsPanel>
+            <v:CommitRefsPresenter IconBackground="{DynamicResource Brush.DecoratorIconBG}"
-              <ItemsPanelTemplate>
+                                   IconForeground="{DynamicResource Brush.DecoratorIcon}"
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                   BranchNameBackground="{DynamicResource Brush.DecoratorBranch}"
-              </ItemsPanelTemplate>
+                                   TagNameBackground="{DynamicResource Brush.DecoratorTag}"
-            </ItemsControl.ItemsPanel>
+                                   LabelForeground="{DynamicResource Brush.DecoratorFG}"
-
+                                   FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}"
-            <ItemsControl.ItemTemplate>
+                                   FontSize="10"
-              <DataTemplate DataType="{x:Type m:Decorator}">
+                                   VerticalAlignment="Center"/>
-                <Border Height="16" Margin="0,0,6,0" CornerRadius="2" ClipToBounds="True">
+          </Border>
-                  <StackPanel Orientation="Horizontal">
+          
-                    <Border Background="{DynamicResource Brush.DecoratorIconBG}" Width="16">
-                      <Path Width="8" Height="8" Data="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToIcon}}" Fill="{DynamicResource Brush.DecoratorIcon}"/>
-                    </Border>
-                    <Border Background="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToBackground}}">
-                      <TextBlock Classes="monospace" Text="{Binding Name}" FontSize="10" Margin="4,0" Foreground="{DynamicResource Brush.DecoratorFG}"/>
-                    </Border>
-                  </StackPanel>
-                </Border>
-              </DataTemplate>
-            </ItemsControl.ItemTemplate>
-          </ItemsControl>
-
           <!-- Messages -->
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
           <SelectableTextBlock Grid.Row="3" Grid.Column="1" Margin="12,5,8,0" Text="{Binding #ThisControl.Message}" FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}" TextWrapping="Wrap"/>

src/Views/CommitRefsPresenter.cs

@@ -0,0 +1,202 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace SourceGit.Views
+{
+    public class CommitRefsPresenter : Control
+    {
+        public class RenderItem
+        {
+            public Geometry Icon { get; set; } = null;
+            public FormattedText Label { get; set; } = null;
+            public bool IsTag { get; set; } = false;
+        }
+
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextBlock.FontFamilyProperty.AddOwner<CommitRefsPresenter>();
+
+        public FontFamily FontFamily
+        {
+            get => GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
+        }
+
+        public static readonly StyledProperty<double> FontSizeProperty =
+           TextBlock.FontSizeProperty.AddOwner<CommitRefsPresenter>();
+
+        public double FontSize
+        {
+            get => GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> IconBackgroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(IconBackground), Brushes.White);
+
+        public IBrush IconBackground
+        {
+            get => GetValue(IconBackgroundProperty);
+            set => SetValue(IconBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> IconForegroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(IconForeground), Brushes.White);
+
+        public IBrush IconForeground
+        {
+            get => GetValue(IconForegroundProperty);
+            set => SetValue(IconForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> LabelForegroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(LabelForeground), Brushes.White);
+
+        public IBrush LabelForeground
+        {
+            get => GetValue(LabelForegroundProperty);
+            set => SetValue(LabelForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> BranchNameBackgroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(BranchNameBackground), Brushes.White);
+
+        public IBrush BranchNameBackground
+        {
+            get => GetValue(BranchNameBackgroundProperty);
+            set => SetValue(BranchNameBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> TagNameBackgroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(TagNameBackground), Brushes.White);
+
+        public IBrush TagNameBackground
+        {
+            get => GetValue(TagNameBackgroundProperty);
+            set => SetValue(TagNameBackgroundProperty, value);
+        }
+
+        static CommitRefsPresenter()
+        {
+            AffectsMeasure<CommitRefsPresenter>(
+                FontFamilyProperty, 
+                FontSizeProperty,
+                LabelForegroundProperty);
+
+            AffectsRender<CommitRefsPresenter>(
+                IconBackgroundProperty, 
+                IconForegroundProperty, 
+                BranchNameBackgroundProperty, 
+                TagNameBackgroundProperty);
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            if (_items.Count == 0)
+                return;
+
+            var iconFG = IconForeground;
+            var iconBG = IconBackground;
+            var branchBG = BranchNameBackground;
+            var tagBG = TagNameBackground;            
+            var x = 0.0;
+
+            foreach (var item in _items)
+            {
+                var iconRect = new RoundedRect(new Rect(x, 0, 16, 16), new CornerRadius(2, 0, 0, 2));
+                var labelRect = new RoundedRect(new Rect(x + 16, 0, item.Label.Width + 8, 16), new CornerRadius(0, 2, 2, 0));
+
+                context.DrawRectangle(iconBG, null, iconRect);
+                context.DrawRectangle(item.IsTag ? tagBG : branchBG, null, labelRect);
+                context.DrawText(item.Label, new Point(x + 20, 8.0 - item.Label.Height * 0.5));
+
+                using (context.PushTransform(Matrix.CreateTranslation(x + 4, 4)))
+                    context.DrawGeometry(iconFG, null, item.Icon);
+
+                x += item.Label.Width + 16 + 8 + 4;
+            }
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            InvalidateMeasure();
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            _items.Clear();
+
+            if (DataContext is Models.Commit commit && commit.HasDecorators)
+            {
+                var typeface = new Typeface(FontFamily);
+                var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
+                var labelFG = LabelForeground;
+                var labelSize = FontSize;
+                var requiredWidth = 0.0;
+
+                foreach (var decorator in commit.Decorators)
+                {
+                    var isHead = decorator.Type == Models.DecoratorType.CurrentBranchHead || 
+                        decorator.Type == Models.DecoratorType.CurrentCommitHead;
+
+                    var label = new FormattedText(
+                        decorator.Name,
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        isHead ? typefaceBold : typeface,
+                        labelSize,
+                        labelFG);
+
+                    var item = new RenderItem()
+                    {
+                        Label = label,
+                        IsTag = decorator.Type == Models.DecoratorType.Tag,
+                    };
+
+                    var geo = null as StreamGeometry;
+                    switch (decorator.Type)
+                    {
+                        case Models.DecoratorType.CurrentBranchHead:
+                        case Models.DecoratorType.CurrentCommitHead:
+                            geo = this.FindResource("Icons.Check") as StreamGeometry;
+                            break;
+                        case Models.DecoratorType.RemoteBranchHead:
+                            geo = this.FindResource("Icons.Remote") as StreamGeometry;
+                            break;
+                        case Models.DecoratorType.Tag:
+                            geo = this.FindResource("Icons.Tag") as StreamGeometry;
+                            break;
+                        default:
+                            geo = this.FindResource("Icons.Branch") as StreamGeometry;
+                            break;
+                    }
+
+                    var drawGeo = geo.Clone();
+                    var iconBounds = drawGeo.Bounds;
+                    var translation = Matrix.CreateTranslation(-(Vector)iconBounds.Position);
+                    var scale = Math.Min(8.0 / iconBounds.Width, 8.0 / iconBounds.Height);
+                    var transform = translation * Matrix.CreateScale(scale, scale);
+                    if (drawGeo.Transform == null || drawGeo.Transform.Value == Matrix.Identity)
+                        drawGeo.Transform = new MatrixTransform(transform);
+                    else
+                        drawGeo.Transform = new MatrixTransform(drawGeo.Transform.Value * transform);
+
+                    item.Icon = drawGeo;
+                    _items.Add(item);
+                    requiredWidth += label.Width + 16 /* icon */ + 8 /* label margin */ + 4 /* item right margin */;
+                }
+
+                return new Size(requiredWidth, 16);
+            }
+
+            return new Size(0, 0);
+        }
+
+        private List<RenderItem> _items = new List<RenderItem>();
+    }
+}

src/Views/Histories.axaml

@@ -69,38 +69,16 @@
                              Margin="0,0,4,0"
                              Fill="{DynamicResource Brush.FG1}"
                              IsVisible="{Binding CanPullFromUpstream}"/>
-                    
-                    <ItemsControl ItemsSource="{Binding Decorators}" IsVisible="{Binding HasDecorators}">
-                      <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                          <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                        </ItemsPanelTemplate>
-                      </ItemsControl.ItemsPanel>
 
-                      <ItemsControl.ItemTemplate>
+                    <v:CommitRefsPresenter IsVisible="{Binding HasDecorators}"
-                        <DataTemplate DataType="{x:Type m:Decorator}">
+                                           IconBackground="{DynamicResource Brush.DecoratorIconBG}"
-                          <Border Height="16" Margin="0,0,4,0" CornerRadius="2" ClipToBounds="True">
+                                           IconForeground="{DynamicResource Brush.DecoratorIcon}"
-                            <StackPanel Orientation="Horizontal">
+                                           BranchNameBackground="{DynamicResource Brush.DecoratorBranch}"
-                              <Border Background="{DynamicResource Brush.DecoratorIconBG}" Width="16">
+                                           TagNameBackground="{DynamicResource Brush.DecoratorTag}"
-                                <Path Width="8" Height="8" 
+                                           LabelForeground="{DynamicResource Brush.DecoratorFG}"
-                                      Stretch="Uniform" 
+                                           FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}"
-                                      Data="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToIcon}}" 
+                                           FontSize="10"
-                                      Fill="{DynamicResource Brush.DecoratorIcon}"
+                                           VerticalAlignment="Center"/>
-                                      VerticalAlignment="Center"/>
-                              </Border>
-                              <Border Background="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToBackground}}">
-                                <TextBlock Classes="monospace" 
-                                           Text="{Binding Name}" 
-                                           FontSize="10" 
-                                           Margin="4,0" 
-                                           Foreground="{DynamicResource Brush.DecoratorFG}"
-                                           FontWeight="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToFontWeight}}"/>
-                              </Border>
-                            </StackPanel>
-                          </Border>
-                        </DataTemplate>
-                      </ItemsControl.ItemTemplate>
-                    </ItemsControl>
 
                     <TextBlock Classes="monospace" 
                                Text="{Binding Subject}"

src/Views/Histories.axaml.cs

@@ -371,6 +371,9 @@ namespace SourceGit.Views
         {
             NavigationIdProperty.Changed.AddClassHandler<Histories>((h, _) =>
             {
+                if (h.DataContext == null)
+                    return;
+
                 // Force scroll selected item (current head) into view. see issue #58
                 var datagrid = h.CommitDataGrid;
                 if (datagrid != null && datagrid.SelectedItems.Count == 1)