Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix HUD multiline text alignment (#10795)

Browse Source
This commit is contained in:
Lars Müller 2021-09-19 20:23:22 +02:00 committed by GitHub
parent e0529da5c8
commit 40ea4ddef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/hud.cpp
View File

@ -20,6 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
#include "client/hud.h" #include "client/hud.h"
#include <string>
#include <iostream>
#include <cmath> #include <cmath>
#include "settings.h" #include "settings.h"
#include "util/numeric.h" #include "util/numeric.h"
@ -377,15 +379,19 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
std::wstring text = unescape_translate(utf8_to_wide(e->text)); std::wstring text = unescape_translate(utf8_to_wide(e->text));
core::dimension2d<u32> textsize = textfont->getDimension(text.c_str()); core::dimension2d<u32> textsize = textfont->getDimension(text.c_str());
v2s32 offset((e->align.X - 1.0) * (textsize.Width / 2), v2s32 offset(0, (e->align.Y - 1.0) * (textsize.Height / 2));
(e->align.Y - 1.0) * (textsize.Height / 2));
core::rect<s32> size(0, 0, e->scale.X * m_scale_factor, core::rect<s32> size(0, 0, e->scale.X * m_scale_factor,
text_height * e->scale.Y * m_scale_factor); text_height * e->scale.Y * m_scale_factor);
v2s32 offs(e->offset.X * m_scale_factor, v2s32 offs(e->offset.X * m_scale_factor,
e->offset.Y * m_scale_factor); e->offset.Y * m_scale_factor);
std::wstringstream wss(text);
std::wstring line;
while (std::getline(wss, line, L'\n'))
{ {
textfont->draw(text.c_str(), size + pos + offset + offs, color); core::dimension2d<u32> linesize = textfont->getDimension(line.c_str());
v2s32 line_offset((e->align.X - 1.0) * (linesize.Width / 2), 0);
textfont->draw(line.c_str(), size + pos + offset + offs + line_offset, color);
offset.Y += linesize.Height;
} }
break; } break; }
case HUD_ELEM_STATBAR: { case HUD_ELEM_STATBAR: {