GameUI refactor (part 5/X): Move Game::guitext_chat to GameUI class

Other enhancements:
* Move update_profiler_gui to Game class
* Move updateChat to Game class

2 files changed, 44 insertions, 7 deletions

diff --git a/src/client/gameui.cpp b/src/client/gameui.cpp
index 7955dea59..8a8a091c6 100644
--- a/src/client/gameui.cpp
+++ b/src/client/gameui.cpp
@@ -58,8 +58,12 @@ void GameUI::init()
 	// Status text (displays info when showing and hiding GUI stuff, etc.)
 	m_guitext_status = gui::StaticText::add(guienv, L"<Status>",
 		core::rect<s32>(0, 0, 0, 0), false, false, guiroot);
-
 	m_guitext_status->setVisible(false);
+
+	// Chat text
+	m_guitext_chat = gui::StaticText::add(guienv, L"", core::rect<s32>(0, 0, 0, 0),
+		//false, false); // Disable word wrap as of now
+		false, true, guiroot);
 }
 
 void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_control,
@@ -183,3 +187,30 @@ void GameUI::showMinimap(bool show)
 {
 	m_flags.show_minimap = show;
 }
+
+void GameUI::setChatText(const EnrichedString &chat_text, u32 recent_chat_count,
+	u32 profiler_current_page)
+{
+	setStaticText(m_guitext_chat, chat_text);
+
+	// Update gui element size and position
+	s32 chat_y = 5;
+
+	if (m_flags.show_debug)
+		chat_y += 2 * g_fontengine->getLineHeight();
+
+	// first pass to calculate height of text to be set
+	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+	s32 width = std::min(g_fontengine->getTextWidth(chat_text.c_str()) + 10,
+		window_size.X - 20);
+	m_guitext_chat->setRelativePosition(core::rect<s32>(10, chat_y, width,
+		chat_y + window_size.Y));
+
+	// now use real height of text and adjust rect according to this size
+	m_guitext_chat->setRelativePosition(core::rect<s32>(10, chat_y, width,
+		chat_y + m_guitext_chat->getTextHeight()));
+
+	// Don't show chat if disabled or empty or profiler is enabled
+	m_guitext_chat->setVisible(m_flags.show_chat &&
+		recent_chat_count != 0 && profiler_current_page == 0);
+}
diff --git a/src/client/gameui.h b/src/client/gameui.h
index fc2b8707e..d1838f628 100644
--- a/src/client/gameui.h
+++ b/src/client/gameui.h
@@ -21,7 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include <IGUIEnvironment.h>
-#include <util/pointedthing.h>
+#include "util/enriched_string.h"
+#include "util/pointedthing.h"
 #include "game.h"
 
 using namespace irr;
@@ -54,7 +55,8 @@ public:
 
 	void init();
 	void update(const RunStats &stats, Client *client, MapDrawControl *draw_control,
-		const CameraOrientation &cam, const PointedThing &pointed_old, float dtime);
+			const CameraOrientation &cam, const PointedThing &pointed_old,
+			float dtime);
 
 	void initFlags();
 	const Flags &getFlags() const { return m_flags; }
@@ -71,20 +73,24 @@ public:
 	}
 	inline void clearStatusText() { m_statustext.clear(); }
 
+	void setChatText(const EnrichedString &chat_text, u32 recent_chat_count,
+			u32 profiler_current_page);
+
 private:
 	Flags m_flags;
 
-	gui::IGUIStaticText *m_guitext = nullptr;          // First line of debug text
-	gui::IGUIStaticText *m_guitext2 = nullptr;         // Second line of debug text
+	gui::IGUIStaticText *m_guitext = nullptr;  // First line of debug text
+	gui::IGUIStaticText *m_guitext2 = nullptr; // Second line of debug text
 
-	gui::IGUIStaticText *m_guitext_info = nullptr;     // At the middle of the screen
+	gui::IGUIStaticText *m_guitext_info = nullptr; // At the middle of the screen
 	std::wstring m_infotext;
 
 	gui::IGUIStaticText *m_guitext_status = nullptr;
 	std::wstring m_statustext;
 	float m_statustext_time = 0.0f;
 
+	gui::IGUIStaticText *m_guitext_chat; // Chat text
+
 	// @TODO future move
-	//	gui::IGUIStaticText *m_guitext_chat;	 // Chat text
 	//	gui::IGUIStaticText *m_guitext_profiler; // Profiler text
 };