From f83b1d648fc6ec2c64fd2c3483fede23c973c20f Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 10 Jul 2025 13:44:10 +0200
Subject: Render font outlines using TTF_SetFontOutline

Rather than rendering the same texture 4 additional times, render a
specific outline version of the text. While reducing the number of times
the text is drawn, it does increase font texture use.

Result is a generally prettier outline due to rendering it properly at
sharp corners of the characters. The shadow for outlined text is now
also thicker, as appropriate.

As part of this change, the `TextRenderer` class was merged into the
`Graphics` and `TrueTypeFont` classes. There seemed to be little point
in having a separate function for this, apart from needing more static
casts to `Graphics*`.

Also fixed an issue where the font style was not being restored after
adjusting the font scale, when using an older SDL_ttf than 2.0.18.

Closes #87
---
 src/gui/widgets/button.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/gui/widgets/button.cpp')

diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 31c3a677..604f5dc8 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -28,7 +28,6 @@
 
 #include "resources/image.h"
 #include "resources/theme.h"
-#include "textrenderer.h"
 
 #include <guichan/exception.hpp>
 #include <guichan/font.hpp>
@@ -132,8 +131,9 @@ void Button::draw(gcn::Graphics *graphics)
     if (isPressed())
         widgetState.flags |= STATE_SELECTED;
 
+    auto g = static_cast<Graphics *>(graphics);
     auto &skin = gui->getTheme()->getSkin(SkinType::Button);
-    skin.draw(static_cast<Graphics *>(graphics), widgetState);
+    skin.draw(g, widgetState);
 
     auto skinState = skin.getState(widgetState.flags);
     auto font = (skinState && skinState->textFormat.bold) ? boldFont : getFont();
@@ -196,18 +196,16 @@ void Button::draw(gcn::Graphics *graphics)
     }
 
     if (btnIconWidth)
-        static_cast<Graphics *>(graphics)->drawImage(icon, btnIconX, btnIconY);
+        g->drawImage(icon, btnIconX, btnIconY);
 
     if (auto skinState = skin.getState(widgetState.flags))
     {
-        auto &textFormat = skinState->textFormat;
-        TextRenderer::renderText(static_cast<Graphics *>(graphics),
-                                 getCaption(),
-                                 textX,
-                                 textY,
-                                 getAlignment(),
-                                 font,
-                                 textFormat);
+        g->drawText(getCaption(),
+                    textX,
+                    textY,
+                    getAlignment(),
+                    font,
+                    skinState->textFormat);
     }
 }
 
-- 
cgit v1.2.3-70-g09d2