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

Merge branch 'master' into console-widget

Browse Source
This commit is contained in:
Lynix
2017-08-30 16:14:53 +02:00
parent f00359072f 9ec88c84b5
commit 1e5e1d5f6d
351 changed files with 12761 additions and 4549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,11 @@ namespace Ndk
* \param instance Lua instance that will interact with the world
*/
Console::Console(BaseWidget* parent, Nz::LuaInstance& instance) :
Console::Console(BaseWidget* parent, Nz::LuaState& state) :
BaseWidget(parent),
m_historyPosition(0),
m_defaultFont(Nz::Font::GetDefault()),
m_instance(instance),
m_state(state),
m_characterSize(24)
{
// History
@@ -65,7 +65,7 @@ namespace Ndk
m_input->OnTextAreaKeyBackspace.Connect([](const TextAreaWidget* textArea, bool* ignoreDefaultAction)
{
if (textArea->GetCursorPosition() <= s_inputPrefixSize)
if (textArea->GetGlyphUnderCursor() <= s_inputPrefixSize)
*ignoreDefaultAction = true;
});
@@ -157,8 +157,8 @@ namespace Ndk
AddLine(input); //< With the input prefix
if (!m_instance.Execute(inputCmd))
AddLine(m_instance.GetLastError(), Nz::Color::Red);
if (!m_state.Execute(inputCmd))
AddLine(m_state.GetLastError(), Nz::Color::Red);
}
/*!