Fix label color blending

HebaruSan · Sep 27, 2024 · f6e3b1e · f6e3b1e
1 parent 286d3eb
commit f6e3b1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/GUI/Model/ModList.cs b/GUI/Model/ModList.cs
@@ -392,6 +392,8 @@ public Color GetRowBackground(GUIMod mod, bool conflicted, string? instanceName,
                                                                       .Where(l => l.ContainsModule(game, mod.Identifier))
                                                                       .Select(l => l.Color)
                                                                       .OfType<Color>()
+                                                                      // No transparent blending
+                                                                      .Where(c => c.A == byte.MaxValue)
                                                                       .ToArray())
              : Color.Transparent;
 

diff --git a/GUI/Util.cs b/GUI/Util.cs
@@ -288,7 +288,10 @@ public static Color BlendColors(Color[] colors)
             => colors.Length <  1 ? Color.Empty
              //: colors is [var c] ? c
              : colors.Length == 1 && colors[0] is var c ? c
-             : colors.Aggregate((back, fore) => fore.AlphaBlendWith(1f / colors.Length, back));
+             : Color.FromArgb(colors.Sum(c => c.A) / colors.Length,
+                              colors.Sum(c => c.R) / colors.Length,
+                              colors.Sum(c => c.G) / colors.Length,
+                              colors.Sum(c => c.B) / colors.Length);
 
         public static Color AlphaBlendWith(this Color c1, float alpha, Color c2)
             => AddColors(c1.MultiplyBy(alpha),