games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Do not attempt to resize text box to zero-width

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-26 18:55:50 +02:00
parent 560a1231a6
commit 81a48f2d80
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/widgets/TextControls.cpp
View File

@@ -376,6 +376,7 @@ void CTextBox::setText(const std::string & text)
{
// decrease width again if slider still used
label->pos.w = pos.w - 32;
assert(label->pos.w > 0);
label->setText(text);
slider->setAmount(label->textSize.y);
}
@@ -383,6 +384,7 @@ void CTextBox::setText(const std::string & text)
{
// create slider and update widget
label->pos.w = pos.w - 32;
assert(label->pos.w > 0);
label->setText(text);
OBJECT_CONSTRUCTION_CUSTOM_CAPTURING(255 - DISPOSE);

4
client/windows/CMessage.cpp
View File

@@ -120,6 +120,10 @@ SDL_Surface * CMessage::drawDialogBox(int w, int h, PlayerColor playerColor)
std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWidth, EFonts font )
{
assert(maxLineWidth != 0);
if (maxLineWidth == 0)
return { text };
std::vector<std::string> ret;
boost::algorithm::trim_right_if(text,boost::algorithm::is_any_of(std::string(" ")));

4
client/windows/InfoWindows.cpp
View File

@@ -150,7 +150,9 @@ CInfoWindow::CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo
text = std::make_shared<CTextBox>(Text, Rect(0, 0, 250, 100), 0, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE);
if(!text->slider)
{
text->resize(text->label->textSize);
int finalWidth = std::min(250, text->label->textSize.x + 32);
int finalHeight = text->label->textSize.y;
text->resize(Point(finalWidth, finalHeight));
}
if(buttons.size() == 1)