rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed float to int warning in VS

0.8
Bruno Van de Velde 2015-09-19 18:08:55 +02:00
parent b2dc8d9dfd
commit bd0e15154f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/TGUI/Global.cpp
View File

@ -222,15 +222,15 @@ namespace tgui
for (unsigned int i = 0; i < static_cast<unsigned int>(height); ++i)
textSizes[i] = i + 1;
std::vector<unsigned int>::iterator high = std::lower_bound(textSizes.begin(), textSizes.end(), height, [&font](unsigned int charSize, float h){ return font->getLineSpacing(charSize) < h; });
auto high = std::lower_bound(textSizes.begin(), textSizes.end(), height, [&font](unsigned int charSize, float h){ return font->getLineSpacing(charSize) < h; });
if (high == textSizes.end())
return height;
return static_cast<unsigned int>(height);
float highLineSpacing = font->getLineSpacing(*high);
if (highLineSpacing == height)
return *high;
std::vector<unsigned int>::iterator low = high - 1;
auto low = high - 1;
float lowLineSpacing = font->getLineSpacing(*low);
if (fit < 0)