mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:07:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'hashtagcornyphrase' into 'master'

Browse source 
Don't replace tags when dealing with console input

See merge request OpenMW/openmw!3291
This commit is contained in:
psi29a 2023-08-08 08:54:23 +00:00
commit 84e71f4977
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwgui/console.cpp
View file

@ -285,7 +285,7 @@ namespace MWGui
{
if (key == MyGUI::KeyCode::W)
{
const auto& caption = mCommandLine->getCaption();
auto caption = mCommandLine->getOnlyText();
if (caption.empty())
return;
size_t max = mCommandLine->getTextCursor();
@ -296,9 +296,8 @@ namespace MWGui
size_t length = mCommandLine->getTextCursor() - max;
if (length > 0)
{
auto text = caption;
text.erase(max, length);
mCommandLine->setCaption(text);
caption.erase(max, length);
mCommandLine->setOnlyText(caption);
mCommandLine->setTextCursor(max);
}
}
@ -306,9 +305,9 @@ namespace MWGui
{
if (mCommandLine->getTextCursor() > 0)
{
auto text = mCommandLine->getCaption();
auto text = mCommandLine->getOnlyText();
text.erase(0, mCommandLine->getTextCursor());
mCommandLine->setCaption(text);
mCommandLine->setOnlyText(text);
mCommandLine->setTextCursor(0);
}
}
@ -317,9 +316,9 @@ namespace MWGui
{
std::vector<std::string> matches;
listNames();
std::string oldCaption = mCommandLine->getCaption();
std::string oldCaption = mCommandLine->getOnlyText();
std::string newCaption = complete(mCommandLine->getOnlyText(), matches);
mCommandLine->setCaption(newCaption);
mCommandLine->setOnlyText(newCaption);
// List candidates if repeatedly pressing tab
if (oldCaption == newCaption && !matches.empty())
@ -350,7 +349,7 @@ namespace MWGui
if (mCurrent != mCommandHistory.begin())
{
--mCurrent;
mCommandLine->setCaption(*mCurrent);
mCommandLine->setOnlyText(*mCurrent);
}
}
else if (key == MyGUI::KeyCode::ArrowDown)
@ -360,10 +359,10 @@ namespace MWGui
++mCurrent;
if (mCurrent != mCommandHistory.end())
mCommandLine->setCaption(*mCurrent);
mCommandLine->setOnlyText(*mCurrent);
else
// Restore the edit string
mCommandLine->setCaption(mEditString);
mCommandLine->setOnlyText(mEditString);
}
}
}