From e28b537f899e81b35b5f58e99763ee7d4fcc600f Mon Sep 17 00:00:00 2001
From: Nathan Baulch <nathan.baulch@gmail.com>
Date: Mon, 16 Jun 2025 14:19:14 +1000
Subject: [PATCH] enhance: darker `ChangeStatusIcon` when using dark theme
 (#1423)

---
 src/Views/ChangeStatusIcon.cs | 86 ++++++++++++-----------------------
 1 file changed, 30 insertions(+), 56 deletions(-)

diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs
index d66ac11d..ea88dbb5 100644
--- a/src/Views/ChangeStatusIcon.cs
+++ b/src/Views/ChangeStatusIcon.cs
@@ -4,57 +4,24 @@ using System.Globalization;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
+using Avalonia.Styling;
 
 namespace SourceGit.Views
 {
     public class ChangeStatusIcon : Control
     {
         private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "★", "!"];
-        private static readonly IBrush[] BACKGROUNDS = [
-            Brushes.Transparent,
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Colors.Tomato, 0), new GradientStop(Color.FromRgb(252, 165, 150), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Colors.Orchid, 0), new GradientStop(Color.FromRgb(248, 161, 245), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            new LinearGradientBrush
-            {
-                GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) },
-                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
-            },
-            Brushes.OrangeRed,
+        private static readonly Color[] COLOR =
+        [
+            Colors.Transparent,
+            Colors.Goldenrod,
+            Colors.Goldenrod,
+            Colors.LimeGreen,
+            Colors.Tomato,
+            Colors.Orchid,
+            Colors.Goldenrod,
+            Colors.LimeGreen,
+            Colors.OrangeRed,
         ];
 
         public static readonly StyledProperty<bool> IsUnstagedChangeProperty =
@@ -75,6 +42,11 @@ namespace SourceGit.Views
             set => SetValue(ChangeProperty, value);
         }
 
+        public ChangeStatusIcon()
+        {
+            ActualThemeVariantChanged += (_, _) => InvalidateVisual();
+        }
+
         public override void Render(DrawingContext context)
         {
             if (Change == null || Bounds.Width <= 0)
@@ -82,18 +54,20 @@ namespace SourceGit.Views
 
             var typeface = new Typeface("fonts:SourceGit#JetBrains Mono");
 
-            IBrush background;
-            string indicator;
-            if (IsUnstagedChange)
+            var idx = (int)(IsUnstagedChange ? Change.WorkTree : Change.Index);
+            var indicator = INDICATOR[idx];
+            var color = COLOR[idx];
+            var hsl = color.ToHsl();
+            var color2 = ActualThemeVariant == ThemeVariant.Dark
+                ? new HslColor(hsl.A, hsl.H,hsl.S, hsl.L - 0.1).ToRgb()
+                : new HslColor(hsl.A, hsl.H,hsl.S, hsl.L + 0.1).ToRgb();
+
+            var background = new LinearGradientBrush
             {
-                background = BACKGROUNDS[(int)Change.WorkTree];
-                indicator = INDICATOR[(int)Change.WorkTree];
-            }
-            else
-            {
-                background = BACKGROUNDS[(int)Change.Index];
-                indicator = INDICATOR[(int)Change.Index];
-            }
+                GradientStops = [new GradientStop(color, 0), new GradientStop(color2, 1)],
+                StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
+            };
 
             var txt = new FormattedText(
                 indicator,