diff --git a/src/SourceGit/Converters/BoolConverters.cs b/src/SourceGit/Converters/BoolConverters.cs index 1311e875..bfe3bf41 100644 --- a/src/SourceGit/Converters/BoolConverters.cs +++ b/src/SourceGit/Converters/BoolConverters.cs @@ -1,4 +1,5 @@ using Avalonia.Data.Converters; +using Avalonia.Media; namespace SourceGit.Converters { @@ -6,5 +7,8 @@ namespace SourceGit.Converters { public static readonly FuncValueConverter ToCommitOpacity = new FuncValueConverter(x => x ? 1 : 0.5); + + public static readonly FuncValueConverter ToCommitFontWeight = + new FuncValueConverter(x => x ? FontWeight.Bold : FontWeight.Regular); } } diff --git a/src/SourceGit/Models/Commit.cs b/src/SourceGit/Models/Commit.cs index edbb54ef..4b3f0ed3 100644 --- a/src/SourceGit/Models/Commit.cs +++ b/src/SourceGit/Models/Commit.cs @@ -30,6 +30,11 @@ namespace SourceGit.Models get => Author != Committer || AuthorTime != CommitterTime; } + public bool IsCurrentHead + { + get => Decorators.Find(x => x.Type == DecoratorType.CurrentBranchHead) != null; + } + public string FullMessage { get => string.IsNullOrWhiteSpace(Message) ? Subject : $"{Subject}\n\n{Message}"; diff --git a/src/SourceGit/Views/Histories.axaml b/src/SourceGit/Views/Histories.axaml index 13fa7275..4a621c59 100644 --- a/src/SourceGit/Views/Histories.axaml +++ b/src/SourceGit/Views/Histories.axaml @@ -62,7 +62,10 @@ - + @@ -88,7 +91,8 @@ + Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.ToCommitOpacity}}" + FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.ToCommitFontWeight}}"/> @@ -99,7 +103,8 @@ + Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.ToCommitOpacity}}" + FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.ToCommitFontWeight}}"/> @@ -110,7 +115,8 @@ + Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.ToCommitOpacity}}" + FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.ToCommitFontWeight}}"/>