LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor.

Browse Source 
--HG--
branch : minor
This commit is contained in:
rude
2011-03-09 12:39:21 +01:00
parent a2dadbf049 3c7353be9d
commit 2546f27b07
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+3 -3
View File
@@ -738,7 +738,7 @@ namespace opengl
using namespace std;
string text(str);
const float width_space = currentFont->getWidth(' ');
const float width_space = static_cast<float>(currentFont->getWidth(' '));
vector<string> lines_to_draw;
//split text at newlines
@@ -763,7 +763,7 @@ namespace opengl
if (width >= wrap) {
lines_to_draw.push_back( string_builder.str() );
string_builder.str( "" );
width = currentFont->getWidth( word );
width = static_cast<float>(currentFont->getWidth( word ));
}
string_builder << word << " ";
width += width_space;
@@ -775,7 +775,7 @@ namespace opengl
// now for the actual printing
vector<string>::const_iterator line_iter, line_end = lines_to_draw.end();
for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) {
float width = currentFont->getWidth( *line_iter );
float width = static_cast<float>(currentFont->getWidth( *line_iter ));
switch (align) {
case ALIGN_RIGHT:
currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y));