minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fix position of the infotext

Browse Source
This commit is contained in:
MoNTE48 2021-12-04 20:51:03 +01:00
parent 0d1d39b2f9
commit b90fe6bbc6
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/game.cpp
View File

@ -1433,7 +1433,7 @@ bool Game::createClient(const GameStartData &start_data)
bool Game::initGui() bool Game::initGui()
{ {
m_game_ui->init(); m_game_ui->init(client);
// Remove stale "recent" chat messages from previous connections // Remove stale "recent" chat messages from previous connections
chat_backend->clearRecentChat(); chat_backend->clearRecentChat();

13
src/client/gameui.cpp
View File

@ -51,7 +51,7 @@ GameUI::GameUI()
m_statustext_initial_color = video::SColor(255, 0, 0, 0); m_statustext_initial_color = video::SColor(255, 0, 0, 0);
} }
void GameUI::init() void GameUI::init(Client *client)
{ {
// First line of debug text // First line of debug text
m_guitext = gui::StaticText::add(guienv, utf8_to_wide(PROJECT_NAME_C).c_str(), m_guitext = gui::StaticText::add(guienv, utf8_to_wide(PROJECT_NAME_C).c_str(),
@ -74,11 +74,14 @@ void GameUI::init()
// At the middle of the screen // At the middle of the screen
// Object infos are shown in this // Object infos are shown in this
u32 chat_font_height = m_guitext_chat->getActiveFont()->getDimension(L"Ay").Height; u32 chat_font_height = m_guitext_chat->getActiveFont()->getDimension(L"Ay").Height;
float scale = RenderingEngine::getDisplayDensity() * client->getHudScaling();
#if defined(__ANDROID__) || defined(__IOS__)
scale /= 2;
#endif
m_guitext_info = gui::StaticText::add(guienv, L"", m_guitext_info = gui::StaticText::add(guienv, L"",
core::rect<s32>(0, 0, 400, g_fontengine->getTextHeight() * 5 + 5) + core::rect<s32>(0, 0, 400, g_fontengine->getTextHeight() * 6) +
v2s32(100, chat_font_height * v2s32(100 + client->getRoundScreen(),
(g_settings->getU16("recent_chat_messages") + 3)) * chat_font_height * (g_settings->getU16("recent_chat_messages") + 3) * scale),
RenderingEngine::getDisplayDensity(),
false, true, guiroot); false, true, guiroot);
// Status text (displays info when showing and hiding GUI stuff, etc.) // Status text (displays info when showing and hiding GUI stuff, etc.)

2
src/client/gameui.h
View File

@ -62,7 +62,7 @@ public:
bool show_profiler_graph = false; bool show_profiler_graph = false;
}; };
void init(); void init(Client *client);
void update(const RunStats &stats, Client *client, MapDrawControl *draw_control, void update(const RunStats &stats, Client *client, MapDrawControl *draw_control,
const CameraOrientation &cam, const PointedThing &pointed_old, const CameraOrientation &cam, const PointedThing &pointed_old,
const GUIChatConsole *chat_console, float dtime); const GUIChatConsole *chat_console, float dtime);