fix GetColorValues returning ARGB instead of RGBA

PhantomGamers · Nov 19, 2023 · 92af6a2 · 92af6a2
1 parent 5a1edc7
commit 92af6a2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/SFP/Models/Utils.cs b/SFP/Models/Utils.cs
@@ -62,4 +62,16 @@ public static List<string> GetCommandLine(Process? process)
 
         return new List<string>();
     }
+
+    public static string ConvertARGBtoRGBA(string argb)
+    {
+        if (argb.Length != 9 || !argb.StartsWith("#"))
+        {
+            throw new ArgumentException("Invalid ARGB format");
+        }
+        var alpha = argb.Substring(1, 2);
+        var rgb = argb[3..];
+        return "#" + rgb + alpha;
+    }
+
 }
diff --git a/SFP_UI/App.axaml.cs b/SFP_UI/App.axaml.cs
@@ -79,16 +79,20 @@ private static IEnumerable<string> GetColorValues()
     {
         if (Current!.Styles[0] is not FluentAvaloniaTheme faTheme)
         {
+            Log.Logger.Warn("Could not get color values, FluentAvaloniaTheme is null");
             return Array.Empty<string>();
         }
         var colorValues = new string[7];
         for (var i = 0; i < 7; i++)
         {
             if (!faTheme.Resources.TryGetResource(Injector.ColorNames[i], null, out var c))
             {
+                Log.Logger.Warn("Could not get color value for {ColorName}", Injector.ColorNames[i]);
                 continue;
             }
-            colorValues[i] = c?.ToString() ?? colorValues[i];
+
+            var rgbaStr = Utils.ConvertARGBtoRGBA(c!.ToString()!);
+            colorValues[i] = rgbaStr;
         }
 
         return colorValues;