Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes W_LABEL after f23a94d644.

master
Rene Jochum 2011-05-01 19:17:35 +02:00
parent 917a7570c8
commit c973d67004
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/widget/label.cpp
View File

@ -51,46 +51,41 @@ W_LABEL::W_LABEL(W_LABINIT const *init)
{
sstrcpy(aText, init->pText);
// Limit the wordwrap feature to
// widgets using "labelDisplay" as output function.
if (init->pDisplay == labelDisplay)
iV_SetFont(FontID);
QStringList words = QString(init->pText).split(" ");
QStringList line;
unsigned int wsize, lsize = 0;
foreach(const QString &word, words)
{
iV_SetFont(FontID);
QStringList words = QString(init->pText).split(" ");
QStringList line;
unsigned int wsize, lsize = 0;
foreach(const QString &word, words)
wsize = iV_GetTextWidth(word.toUtf8().constData());
if (lsize + wsize >= width)
{
wsize = iV_GetTextWidth(word.toUtf8().constData());
if (lsize + wsize >= width)
if (line.isEmpty())
{
if (line.isEmpty())
{
// Let iv_DrawText handle to long lines.
lines << word;
}
else
{
// Append current line and create a new one with that word.
lines << line.join(" ");
line.clear();
line << word;
lsize = wsize;
}
// Let iv_DrawText handle to long lines.
lines << word;
}
else
{
// Append current line and create a new one with that word.
lines << line.join(" ");
line.clear();
line << word;
lsize += wsize;
lsize = wsize;
}
}
if (!line.isEmpty())
else
{
lines << line.join(" ");
line << word;
lsize += wsize;
}
lines = lines;
}
if (!line.isEmpty())
{
lines << line.join(" ");
}
lines = lines;
}
}
@ -128,7 +123,6 @@ void labelFree(W_LABEL *psWidget)
delete psWidget;
}
/* label display function */
void labelDisplay(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours)
{