diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml index 34b18b79..aa0cbbb8 100644 --- a/src/Resources/Themes.axaml +++ b/src/Resources/Themes.axaml @@ -10,7 +10,7 @@ #FFFAFAFA #FFB0CEE8 #FF1F1F1F - #79855f + DarkGreen #FF836C2E #FFFFFFFF #FFCFCFCF diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml index 3c699122..623332c4 100644 --- a/src/Views/CommitBaseInfo.axaml +++ b/src/Views/CommitBaseInfo.axaml @@ -102,7 +102,8 @@ Foreground="{DynamicResource Brush.FG1}" FontFamily="{DynamicResource Fonts.Primary}" FontSize="11" - VerticalAlignment="Center"/> + VerticalAlignment="Center" + UseGraphColor="False"/> diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs index cb24588a..36302dbf 100644 --- a/src/Views/CommitRefsPresenter.cs +++ b/src/Views/CommitRefsPresenter.cs @@ -46,6 +46,15 @@ namespace SourceGit.Views set => SetValue(ForegroundProperty, value); } + public static readonly StyledProperty UseGraphColorProperty = + AvaloniaProperty.Register(nameof(UseGraphColor), false); + + public bool UseGraphColor + { + get => GetValue(UseGraphColorProperty); + set => SetValue(UseGraphColorProperty, value); + } + public static readonly StyledProperty TagBackgroundProperty = AvaloniaProperty.Register(nameof(TagBackground), Brushes.White); @@ -122,6 +131,7 @@ namespace SourceGit.Views var typeface = new Typeface(FontFamily); var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold); var fg = Foreground; + var normalBG = UseGraphColor ? commit.Brush : Brushes.Gray; var tagBG = TagBackground; var labelSize = FontSize; var requiredWidth = 0.0; @@ -139,7 +149,13 @@ namespace SourceGit.Views isHead ? labelSize + 1 : labelSize, fg); - var item = new RenderItem() { Label = label, Brush = commit.Brush, IsHead = isHead }; + var item = new RenderItem() + { + Label = label, + Brush = normalBG, + IsHead = isHead + }; + StreamGeometry geo; switch (decorator.Type) { diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml index 201375f7..bc86706b 100644 --- a/src/Views/Histories.axaml +++ b/src/Views/Histories.axaml @@ -142,7 +142,8 @@ Foreground="{DynamicResource Brush.FG1}" FontFamily="{DynamicResource Fonts.Primary}" FontSize="11" - VerticalAlignment="Center"/> + VerticalAlignment="Center" + UseGraphColor="True"/>