github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 10:47:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

In #283 it was reported that Greenshot doesn't draw unicode icons correctly. this should solve it.

Browse source
This commit is contained in:
Robin Krom 2021-03-08 23:19:34 +01:00
commit 4c509618af
1 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Greenshot/Drawing/TextContainer.cs
View file

@ -598,6 +598,41 @@ namespace Greenshot.Drawing
DrawText(graphics, rect, lineThickness, lineColor, drawShadow, _stringFormat, text, _font);
}
private static TextFormatFlags ConvertStringFormat(StringFormat stringFormat)
{
TextFormatFlags flags = TextFormatFlags.Default;
if (stringFormat == null)
{
return flags;
}
switch (stringFormat.LineAlignment)
{
case StringAlignment.Center:
flags |= TextFormatFlags.VerticalCenter;
break;
case StringAlignment.Far:
flags |= TextFormatFlags.Bottom;
break;
case StringAlignment.Near:
flags |= TextFormatFlags.Top;
break;
}
switch (stringFormat.Alignment)
{
case StringAlignment.Center:
flags |= TextFormatFlags.HorizontalCenter;
break;
case StringAlignment.Far:
flags |= TextFormatFlags.Right;
break;
case StringAlignment.Near:
flags |= TextFormatFlags.Left;
break;
}
return flags;
}
/// <summary>
/// This method can be used from other containers
/// </summary>
@ -636,8 +671,8 @@ namespace Greenshot.Drawing
shadowRect.Inflate(-textOffset, -textOffset);
}
using Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100));
graphics.DrawString(text, font, fontBrush, shadowRect, stringFormat);
TextRenderer.DrawText(graphics, text, font, shadowRect, Color.FromArgb(alpha, 100, 100, 100), ConvertStringFormat(stringFormat));
currentStep++;
alpha -= basealpha / steps;
}
@ -647,16 +682,14 @@ namespace Greenshot.Drawing
{
drawingRectange.Inflate(-textOffset, -textOffset);
}
using (Brush fontBrush = new SolidBrush(fontColor))
if (stringFormat != null)
{
if (stringFormat != null)
{
graphics.DrawString(text, font, fontBrush, drawingRectange, stringFormat);
}
else
{
graphics.DrawString(text, font, fontBrush, drawingRectange);
}
TextRenderer.DrawText(graphics, text, font, drawingRectange, fontColor, ConvertStringFormat(stringFormat));
}
else
{
TextRenderer.DrawText(graphics, text, font, drawingRectange, fontColor);
}
}