games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Reduced usage of topWindow() method

Browse Source
This commit is contained in:
Ivan Savenko
2023-05-16 18:34:23 +03:00
parent e2ef136003
commit ad3e54e6c0
30 changed files with 171 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/widgets/TextControls.cpp
View File

@@ -434,9 +434,7 @@ CGStatusBar::CGStatusBar(int x, int y, std::string name, int maxw)
CGStatusBar::~CGStatusBar()
{
assert(GH.statusbar.get() != this || GH.statusbar == nullptr);
if (GH.statusbar.get() == this)
GH.statusbar = nullptr;
assert(GH.statusbar().get() != this);
}
void CGStatusBar::show(SDL_Surface * to)
@@ -455,13 +453,14 @@ void CGStatusBar::clickLeft(tribool down, bool previousState)
void CGStatusBar::activate()
{
GH.statusbar = shared_from_this();
GH.setStatusbar(shared_from_this());
CIntObject::activate();
}
void CGStatusBar::deactivate()
{
assert(GH.statusbar.get() == this);
assert(GH.statusbar().get() == this);
GH.setStatusbar(nullptr);
if (enteringText)
LOCPLINT->cingconsole->endEnteringText(false);