github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-24 07:06:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean

Browse source
This commit is contained in:
Julien Richard 2022-01-25 21:20:58 +01:00
commit 1a57e75009
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Greenshot.Editor/Drawing/EmojiRenderer.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO;
using System.Reflection; using System.Reflection;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
@ -10,7 +9,6 @@ using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Drawing.Processing; using SixLabors.ImageSharp.Drawing.Processing;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using Font = SixLabors.Fonts.Font;
using FontFamily = SixLabors.Fonts.FontFamily; using FontFamily = SixLabors.Fonts.FontFamily;
using FontStyle = SixLabors.Fonts.FontStyle; using FontStyle = SixLabors.Fonts.FontStyle;
using Image = System.Drawing.Image; using Image = System.Drawing.Image;
@ -32,16 +30,16 @@ namespace Greenshot.Editor.Drawing
public static Image<Rgba32> GetImage(string emoji, int iconSize) public static Image<Rgba32> GetImage(string emoji, int iconSize)
{ {
var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
var image = new Image<Rgba32>(iconSize, iconSize); var image = new Image<Rgba32>(iconSize, iconSize);
RenderEmoji(emoji, font, image); RenderEmoji(emoji, iconSize, image);
return image; return image;
} }
private static void RenderEmoji(string emoji, Font font, SixLabors.ImageSharp.Image image) private static void RenderEmoji(string emoji, int iconSize, SixLabors.ImageSharp.Image image)
{ {
var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
var verticalOffset = font.Size * 0.045f; var verticalOffset = font.Size * 0.045f;
var textOptions = new TextOptions(font) var textOptions = new TextOptions(font)
{ {
@ -58,18 +56,21 @@ namespace Greenshot.Editor.Drawing
int width = iconSize; int width = iconSize;
int height = iconSize; int height = iconSize;
var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
var bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); var bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
BitmapData bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); var bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, width, height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
unsafe try
{ {
var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>((void*)bitmapData.Scan0, width: width, height: height); unsafe
RenderEmoji(emoji, font, image); {
var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>((void*)bitmapData.Scan0, width: width, height: height);
RenderEmoji(emoji, iconSize, image);
}
}
finally
{
bitmap.UnlockBits(bitmapData);
} }
bitmap.UnlockBits(bitmapData);
return bitmap; return bitmap;
} }
@ -84,8 +85,7 @@ namespace Greenshot.Editor.Drawing
var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>(byteMemory: pixels, width: width, height: height); var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>(byteMemory: pixels, width: width, height: height);
var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular); RenderEmoji(emoji, iconSize, image);
RenderEmoji(emoji, font, image);
var source = BitmapSource.Create(pixelWidth: width, pixelHeight: height, dpiX: 96, dpiY: 96, pixelFormat: pixelFormat, palette: null, pixels: pixels, stride: stride); var source = BitmapSource.Create(pixelWidth: width, pixelHeight: height, dpiX: 96, dpiY: 96, pixelFormat: pixelFormat, palette: null, pixels: pixels, stride: stride);
source.Freeze(); source.Freeze();