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

Fixed TextBox line breaking & slider.

Browse Source
This commit is contained in:
DjWarmonger 2012-08-04 17:51:02 +00:00
parent 63a757ac7d
commit 75283bf0fd
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/UIFramework/CIntObjectClasses.cpp
View File

@ -1306,11 +1306,6 @@ void CBoundedLabel::recalculateLines(const std::string &Txt)
int lineCapacity = pos.h / lineHeight;
lines = CMessage::breakText(Txt, pos.w, font);
if(lines.size() > lineCapacity) //we need to add a slider
{
lines = CMessage::breakText(Txt, pos.w - 32 - 10, font);
OBJ_CONSTRUCTION_CAPTURING_ALL;
}
maxH = lineHeight * lines.size();
maxW = 0;
@ -1342,15 +1337,28 @@ CTextBox::CTextBox(std::string Text, const Rect &rect, int SliderStyle, EFonts F
void CTextBox::recalculateLines(const std::string &Txt)
{
CBoundedLabel::recalculateLines (Txt);
//TODO: merge with CBoundedlabel::recalculateLines
vstd::clear_pointer(slider);
lines.clear();
const Font &f = *graphics->fonts[font];
int lineHeight = f.height;
int lineCapacity = pos.h / lineHeight;
vstd::clear_pointer(slider);
lines = CMessage::breakText(Txt, pos.w, font);
if (lines.size() > lineCapacity) //we need to add a slider
{
lines = CMessage::breakText(Txt, pos.w - 32 - 10, font);
OBJ_CONSTRUCTION_CAPTURING_ALL;
slider = new CSlider(pos.w - 32, 0, pos.h, boost::bind(&CTextBox::sliderMoved, this, _1), lineCapacity, lines.size(), 0, false, sliderStyle);
if(active)
slider->activate();
}
maxH = lineHeight * lines.size();
maxW = 0;
BOOST_FOREACH(const std::string &line, lines)
vstd::amax(maxW, f.getWidth(line.c_str()));
}
void CTextBox::showAll(SDL_Surface * to)

2
client/UIFramework/CIntObjectClasses.h
View File

@ -363,7 +363,7 @@ public:
: CLabel (x, y, Font, Align, Color, Text){};
void setTxt(const std::string &Txt);
void setBounds(int limitW, int limitH);
void recalculateLines(const std::string &Txt);
virtual void recalculateLines(const std::string &Txt);
void showAll(SDL_Surface * to);
};