diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2018-01-03 17:28:57 +0100 |
---|---|---|
committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-01-05 20:59:30 +0100 |
commit | 3a772e7ed6c02f91de57320b1694c7d11e1c7618 (patch) | |
tree | 8662cc6a9ac690713d74abdf01406b30c86c8e3b /src/gui/guiEngine.cpp | |
parent | 0ebaed430ad5cd2523d78d2e2c051576e948fe13 (diff) | |
download | minetest-3a772e7ed6c02f91de57320b1694c7d11e1c7618.tar.xz |
GameUI refactor (part 2/X): Move Game::guitext to GameUI + enhancements on StaticText
Other enhancements:
* C++ friendlyness for addStaticText() -> move to static StaticText::add()
Diffstat (limited to 'src/gui/guiEngine.cpp')
-rw-r--r-- | src/gui/guiEngine.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp index e9b4e54c1..3f9bcd888 100644 --- a/src/gui/guiEngine.cpp +++ b/src/gui/guiEngine.cpp @@ -149,9 +149,8 @@ GUIEngine::GUIEngine(JoystickController *joystick, g_fontengine->getTextHeight()); rect += v2s32(4, 0); - m_irr_toplefttext = - addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, - rect, false, true, 0, -1); + m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(), + m_toplefttext, rect, false, true, 0, -1); //create formspecsource m_formspecgui = new FormspecFormSource(""); @@ -560,9 +559,8 @@ void GUIEngine::updateTopLeftTextSize() rect += v2s32(4, 0); m_irr_toplefttext->remove(); - m_irr_toplefttext = - addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, - rect, false, true, 0, -1); + m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(), + m_toplefttext, rect, false, true, 0, -1); } /******************************************************************************/ |