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

Sdk/Console: Add input processing back

This commit is contained in:
Lynix 2017-01-20 20:40:16 +01:00
parent 0257f4be3c
commit 2baaaaa554
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDK/include/NDK/Console.hpp
View File

@ -57,8 +57,7 @@ namespace Ndk
Console& operator=(Console&& console) = default; Console& operator=(Console&& console) = default;
private: private:
void AddLineInternal(const Nz::String& text, const Nz::Color& color = Nz::Color::White); void ExecuteInput(const TextAreaWidget* textArea, bool* ignoreDefaultAction);
void ExecuteInput();
void Layout() override; void Layout() override;
struct Line struct Line

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

@ -55,6 +55,20 @@ namespace Ndk
m_input->SetTextColor(Nz::Color::Black); m_input->SetTextColor(Nz::Color::Black);
m_input->SetPadding(0.f, 2.f, 0.f, 2.f); m_input->SetPadding(0.f, 2.f, 0.f, 2.f);
m_input->OnTextAreaKeyReturn.Connect(this, &Console::ExecuteInput);
// Protect input prefix from erasure/selection
m_input->OnTextAreaCursorMove.Connect([](const TextAreaWidget* textArea, std::size_t* newCursorPos)
{
*newCursorPos = std::max(*newCursorPos, s_inputPrefixSize);
});
m_input->OnTextAreaKeyBackspace.Connect([](const TextAreaWidget* textArea, bool* ignoreDefaultAction)
{
if (textArea->GetCursorPosition() <= s_inputPrefixSize)
*ignoreDefaultAction = true;
});
// General // General
SetPadding(0.f, 0.f, 0.f, 0.f); SetPadding(0.f, 0.f, 0.f, 0.f);
} }
@ -128,11 +142,13 @@ 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() void Console::ExecuteInput(const TextAreaWidget* textArea, bool* ignoreDefaultAction)
{ {
/*Nz::String input = m_inputDrawer.GetText(); NazaraAssert(textArea == m_input, "Unexpected signal from an other text area");
Nz::String inputCmd = input.SubString(s_inputPrefixSize);;
m_inputDrawer.SetText(s_inputPrefix); Nz::String input = m_input->GetText();
Nz::String inputCmd = input.SubString(s_inputPrefixSize);
m_input->SetText(s_inputPrefix);
if (m_commandHistory.empty() || m_commandHistory.back() != inputCmd) if (m_commandHistory.empty() || m_commandHistory.back() != inputCmd)
m_commandHistory.push_back(inputCmd); m_commandHistory.push_back(inputCmd);