Skip to content

Resolve the visual degradation issue when inverting the runner's colors. #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mor39a merged 3 commits into from
Jan 28, 2026
Merged

Resolve the visual degradation issue when inverting the runner's colors. #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aba15d
Replace runner ICO with PNG.
Kyome22 Jan 28, 2026
307e562
Fixed the inversion to correctly handle anti-aliasing.
Kyome22 Jan 28, 2026
d4aa779
Addressed memory leaks and improved error handling.
Kyome22 Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions RunCat365/ContextMenuManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ Action<T> assignValueAction
var color = systemTheme.GetContrastColor();
var iconName = $"{runner.GetString()}_0".ToLower();
var obj = Resources.ResourceManager.GetObject(iconName);
return obj is Icon icon ? (systemTheme == Theme.Light ? icon : icon.Recolor(color)).ToBitmap() : null;
if (obj is not Bitmap bitmap) return null;
return systemTheme == Theme.Light ? bitmap : bitmap.Recolor(color);
}

internal void SetIcons(Theme systemTheme, Theme manualTheme, Runner runner)
Expand All @@ -213,10 +214,16 @@ internal void SetIcons(Theme systemTheme, Theme manualTheme, Runner runner)
for (int i = 0; i < capacity; i++)
{
var iconName = $"{runnerName}_{i}".ToLower();
var icon = rm.GetObject(iconName);
if (icon is null) continue;
if (theme != Theme.Light) icon = ((Icon)icon).Recolor(color);
list.Add((Icon)icon);
if (rm.GetObject(iconName) is not Bitmap bitmap) continue;
if (theme == Theme.Light)
{
list.Add(bitmap.ToIcon());
}
else
{
using var recolored = bitmap.Recolor(color);
list.Add(recolored.ToIcon());
}
}

lock (iconLock)
Expand Down
113 changes: 68 additions & 45 deletions RunCat365/IconRecolorizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,70 +13,93 @@
// limitations under the License.

using System.Drawing.Imaging;
using System.Runtime.InteropServices;

namespace RunCat365 {
internal static class IconExtension
{
[DllImport("user32.dll", CharSet = CharSet.Auto)]
private static extern bool DestroyIcon(IntPtr handle);

internal static Icon Recolor(this Icon icon, Color color)
{
var original = icon.ToBitmap();
var recolored = original.Recolor(color);

var hIcon = recolored.GetHicon();
using var tempIcon = Icon.FromHandle(hIcon);
using var ms = new MemoryStream();
tempIcon.Save(ms);
ms.Position = 0;
var result = new Icon(ms);
DestroyIcon(hIcon);
return result;
}
}

namespace RunCat365
{
internal static class BitmapExtension
{
internal static Bitmap Recolor(this Bitmap icon, Color color)
internal static Bitmap Recolor(this Bitmap bitmap, Color color)
{
var newIcon = new Bitmap(icon.Width, icon.Height, PixelFormat.Format32bppArgb);
using (var g = Graphics.FromImage(newIcon)) g.DrawImage(icon, 0, 0);
var newBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb);

var data = newIcon.LockBits
(
new Rectangle(0, 0, newIcon.Width, newIcon.Height),
ImageLockMode.ReadWrite,
var srcData = bitmap.LockBits(
new Rectangle(0, 0, bitmap.Width, bitmap.Height),
ImageLockMode.ReadOnly,
PixelFormat.Format32bppArgb
);

unsafe
try
{
byte* ptr = (byte*)data.Scan0;
var dstData = newBitmap.LockBits(
new Rectangle(0, 0, newBitmap.Width, newBitmap.Height),
ImageLockMode.WriteOnly,
PixelFormat.Format32bppArgb
);

for (int y = 0; y < newIcon.Height; y++)
try
{
byte* row = ptr + (y * data.Stride);

for (int x = 0; x < newIcon.Width; x++)
unsafe
{
byte* pixel = row + (x * 4);

var a = pixel[3];
byte* srcPtr = (byte*)srcData.Scan0;
byte* dstPtr = (byte*)dstData.Scan0;

if (a > 0)
for (int y = 0; y < bitmap.Height; y++)
{
pixel[0] = color.B;
pixel[1] = color.G;
pixel[2] = color.R;
byte* srcRow = srcPtr + (y * srcData.Stride);
byte* dstRow = dstPtr + (y * dstData.Stride);

for (int x = 0; x < bitmap.Width; x++)
{
byte* srcPixel = srcRow + (x * 4);
byte* dstPixel = dstRow + (x * 4);

dstPixel[0] = color.B;
dstPixel[1] = color.G;
dstPixel[2] = color.R;
dstPixel[3] = srcPixel[3];
}
}
}
}
finally
{
newBitmap.UnlockBits(dstData);
}
}
finally
{
bitmap.UnlockBits(srcData);
}

newIcon.UnlockBits(data);
return newIcon;
return newBitmap;
}

internal static Icon ToIcon(this Bitmap bitmap)
{
using var pngStream = new MemoryStream();
bitmap.Save(pngStream, ImageFormat.Png);
var pngData = pngStream.ToArray();

using var icoStream = new MemoryStream();
using var bw = new BinaryWriter(icoStream);

bw.Write((short)0);
bw.Write((short)1);
bw.Write((short)1);

bw.Write((byte)(bitmap.Width >= 256 ? 0 : bitmap.Width));
bw.Write((byte)(bitmap.Height >= 256 ? 0 : bitmap.Height));
bw.Write((byte)0);
bw.Write((byte)0);
bw.Write((short)1);
bw.Write((short)32);
bw.Write(pngData.Length);
bw.Write(22);

bw.Write(pngData);

icoStream.Position = 0;
return new Icon(icoStream);
}
}
}
Loading