mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-09 07:51:28 +00:00
Code Issues Releases Wiki Activity

Fix font bounds calculation

Browse source 
BitmapFont::getActualWidth() is still a bit less than getStringWidth(),
but won't fix that now since it shouldn't cause any issues... hopefully.
This commit is contained in:
fgenesis 2015-11-11 23:27:32 +01:00
commit 26549f84b7
11 changed files with 118 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BBGE/BitmapFont.cpp
View file

@ -132,12 +132,12 @@ void BitmapText::setText(const std::string &text)
formatText();
}
void BitmapText::setWidth(int width)
void BitmapText::setWidth(float width)
{
textWidth = width;
}
int BitmapText::getSetWidth()
float BitmapText::getSetWidth()
{
return textWidth;
}
@ -155,8 +155,9 @@ void BitmapText::formatText()
lines.clear();
std::string currentLine;
int lastSpace = -1;
int currentWidth = 0;
float currentWidth = 0;
alignWidth = 0;
maxW = 0;
for (int i = 0; i < text.size(); i++)
{
//currentWidth += spacingMap[text[i]]*fontDrawSize;
@ -174,6 +175,7 @@ void BitmapText::formatText()
text = text.substr(lastSpace+1, tsz);
i = 0;
alignWidth = currentWidth;
maxW = std::max(currentWidth, maxW);
currentWidth = 0;
lastSpace = 0;
continue;
@ -182,8 +184,9 @@ void BitmapText::formatText()
if (text[i] == ' ')
{
lastSpace = i;
}
}
}
maxW = std::max(currentWidth, maxW);
if (alignWidth == 0)
alignWidth = currentWidth;
if (!text.empty() && (text.size() > 1 || text[0] != ' '))
@ -248,7 +251,7 @@ void BitmapText::scrollText(const std::string &text, float scrollSpeed)
currentScrollChar = 0;
}
void BitmapText::setFontSize(int sz)
void BitmapText::setFontSize(float sz)
{
this->fontDrawSize = sz;
}