sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDK/Console: Fix history lines handling

This commit is contained in:
Lynix 2019-07-09 19:19:35 +02:00
parent 6b63679c73
commit 71ca599869
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SDK/src/NDK/Console.cpp
View File

@ -38,7 +38,8 @@ namespace Ndk
BaseWidget(parent), BaseWidget(parent),
m_historyPosition(0), m_historyPosition(0),
m_defaultFont(Nz::Font::GetDefault()), m_defaultFont(Nz::Font::GetDefault()),
m_characterSize(24) m_characterSize(24),
m_maxHistoryLines(200)
{ {
// History // History
m_history = Add<TextAreaWidget>(); m_history = Add<TextAreaWidget>();
@ -107,6 +108,9 @@ namespace Ndk
*/ */
void Console::AddLine(const Nz::String& text, const Nz::Color& color) void Console::AddLine(const Nz::String& text, const Nz::Color& color)
{ {
if (m_historyLines.size() >= m_maxHistoryLines)
m_historyLines.erase(m_historyLines.begin());
m_historyLines.emplace_back(Line{ color, text }); m_historyLines.emplace_back(Line{ color, text });
m_history->AppendText(text + '\n'); m_history->AppendText(text + '\n');
m_history->Resize(m_history->GetPreferredSize()); m_history->Resize(m_history->GetPreferredSize());
@ -183,10 +187,12 @@ namespace Ndk
/*! /*!
* \brief Performs this action when an input is added to the console * \brief Performs this action when an input is added to the console
*/ */
void Console::ExecuteInput(const TextAreaWidget* textArea, bool* /*ignoreDefaultAction*/) void Console::ExecuteInput(const TextAreaWidget* textArea, bool* ignoreDefaultAction)
{ {
NazaraAssert(textArea == m_input, "Unexpected signal from an other text area"); NazaraAssert(textArea == m_input, "Unexpected signal from an other text area");
*ignoreDefaultAction = true;
Nz::String input = m_input->GetText(); Nz::String input = m_input->GetText();
Nz::String inputCmd = input.SubString(s_inputPrefixSize); Nz::String inputCmd = input.SubString(s_inputPrefixSize);
m_input->SetText(s_inputPrefix); m_input->SetText(s_inputPrefix);
@ -212,11 +218,8 @@ namespace Ndk
unsigned int lineHeight = m_defaultFont->GetSizeInfo(m_characterSize).lineHeight; unsigned int lineHeight = m_defaultFont->GetSizeInfo(m_characterSize).lineHeight;
float historyHeight = size.y - lineHeight; float historyHeight = size.y - lineHeight;
m_maxHistoryLines = static_cast<unsigned int>(std::ceil(historyHeight / lineHeight)); m_historyArea->SetPosition(origin.x, origin.y);
float diff = historyHeight - m_maxHistoryLines * lineHeight; m_historyArea->Resize({ size.x, historyHeight - 4.f });
m_historyArea->SetPosition(origin.x, origin.y + diff);
m_historyArea->Resize({ size.x, historyHeight - diff - 4.f });
m_input->Resize({size.x, size.y - historyHeight}); m_input->Resize({size.x, size.y - historyHeight});
m_input->SetPosition(origin.x, origin.y + historyHeight); m_input->SetPosition(origin.x, origin.y + historyHeight);