games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Fix slider remain enabled when not needed for changed label text

Browse Source 
This one fix issue with map description label #1977
This commit is contained in:
ArseniyShestakov 2014-11-24 16:18:10 +03:00
parent 0e346a4f0d
commit f2aedabcb3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/widgets/TextControls.cpp
View File

@ -280,15 +280,20 @@ void CTextBox::resize(Point newSize)
void CTextBox::setText(const std::string &text) void CTextBox::setText(const std::string &text)
{ {
label->pos.w = pos.w; // reset to default before textSize.y check
label->setText(text); label->setText(text);
if (label->textSize.y <= label->pos.h && slider) if(label->textSize.y <= label->pos.h && slider)
{ {
// slider is no longer needed // slider is no longer needed
vstd::clear_pointer(slider); vstd::clear_pointer(slider);
label->pos.w = pos.w; }
else if(slider)
{
// decrease width again if slider still used
label->pos.w = pos.w - 32;
label->setText(text); label->setText(text);
} }
else if (label->textSize.y > label->pos.h && !slider) else if(label->textSize.y > label->pos.h)
{ {
// create slider and update widget // create slider and update widget
label->pos.w = pos.w - 32; label->pos.w = pos.w - 32;