Skip to content

[codex] Fix PNG IconSource conversion #232

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

Draft
HavenDV wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[codex] Fix PNG IconSource conversion #232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 32 additions & 2 deletions src/libs/H.NotifyIcon.Shared/Utilities/System.Drawing/StreamExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ internal static class StreamExtensions
internal static Icon ToSmallIcon(this Stream stream)
{
var iconSize = IconUtilities.GetRequiredCustomIconSize(largeIcon: false).ScaleWithDpi();

return new Icon(stream, iconSize);
using var iconStream = stream.ToIconStream();
return new Icon(iconStream, iconSize);
}

[SupportedOSPlatform("windows")]
Expand All @@ -25,4 +25,34 @@ internal static (int Width, int Height, int BitsPerPixel) GetMetadata(this Strea

return (image.Width, image.Height, System.Drawing.Image.GetPixelFormatSize(image.PixelFormat));
}

[SupportedOSPlatform("windows")]
private static MemoryStream ToIconStream(this Stream stream)
{
if (stream == null)
{
throw new ArgumentNullException(nameof(stream));
}

using var buffer = new MemoryStream();
stream.CopyTo(buffer);

var data = buffer.ToArray();
var iconData = IsPng(data) ? data.ConvertPngToIco() : data;

return new MemoryStream(iconData, writable: false);
}

private static bool IsPng(byte[] data)
{
return data.Length >= 8 &&
data[0] == 0x89 &&
data[1] == 0x50 &&
data[2] == 0x4E &&
data[3] == 0x47 &&
data[4] == 0x0D &&
data[5] == 0x0A &&
data[6] == 0x1A &&
data[7] == 0x0A;
}
}
Loading