From 4c509618af68fad3f3dec3ed9f71bf060068f2d1 Mon Sep 17 00:00:00 2001
From: Robin Krom <robin@getgreenshot.org>
Date: Mon, 8 Mar 2021 23:19:34 +0100
Subject: [PATCH] In #283 it was reported that Greenshot doesn't draw unicode
 icons correctly. this should solve it.

---
 Greenshot/Drawing/TextContainer.cs | 55 ++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs
index 4cc369dda..fda883f16 100644
--- a/Greenshot/Drawing/TextContainer.cs
+++ b/Greenshot/Drawing/TextContainer.cs
@@ -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);
             }
         }