games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

changes to status bar according to review comments:

Browse Source 
- renamed IStatusBar API to more clear names
- removed "locking" of status bar
- added comments for IStatusBar API
- removed dynamic_casts to CGStatusBar, now IStatusBar API is fully
sufficient
This commit is contained in:
Ivan Savenko
2022-12-12 18:23:41 +02:00
parent 1558c28c0a
commit d40d5250b7
6 changed files with 150 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
client/widgets/AdventureMapClasses.cpp
View File

@ -1126,54 +1126,31 @@ void CInGameConsole::textEdited(const SDL_TextEditingEvent & event)
void CInGameConsole::startEnteringText()
{
auto statusBar = std::dynamic_pointer_cast<CGStatusBar>(GH.statusbar);
assert(GH.statusbar);
captureAllKeys = true;
enteredText = "_";
if (statusBar)
{
captureAllKeys = true;
CSDL_Ext::startTextInput(&statusBar->pos);
enteredText = "_";
statusBar->alignment = ETextAlignment::TOPLEFT;
statusBar->write(enteredText);
statusBar->lock(true);
}
GH.statusbar->setEnteringMode(true);
GH.statusbar->setEnteredText(enteredText);
}
void CInGameConsole::endEnteringText(bool printEnteredText)
{
captureAllKeys = false;
CSDL_Ext::stopTextInput();
prevEntDisp = -1;
if(printEnteredText)
{
std::string txt = enteredText.substr(0, enteredText.size()-1);
LOCPLINT->cb->sendMessage(txt, LOCPLINT->getSelection());
previouslyEntered.push_back(txt);
//print(txt);
}
enteredText.clear();
auto statusBar = std::dynamic_pointer_cast<CGStatusBar>(GH.statusbar);
if(statusBar)
{
statusBar->alignment = ETextAlignment::CENTER;
}
GH.statusbar->lock(false);
GH.statusbar->clear();
GH.statusbar->setEnteringMode(false);
}
void CInGameConsole::refreshEnteredText()
{
GH.statusbar->lock(false);
GH.statusbar->clear();
GH.statusbar->write(enteredText);
GH.statusbar->lock(true);
GH.statusbar->setEnteredText(enteredText);
}
CAdvMapPanel::CAdvMapPanel(SDL_Surface * bg, Point position)