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

Do not wrap when a single word is longer than the wrap limit.

Browse Source 
(So no extra, empty, newline.)
This commit is contained in:
Bart van Strien
2011-05-14 23:02:52 +02:00
parent cf60754ef0
commit 1a340cd6a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+3 -1
View File
@@ -734,6 +734,7 @@ namespace opengl
// put words back together until a wrap occurs // put words back together until a wrap occurs
float width = 0.0f; float width = 0.0f;
float oldwidth = 0.0f;
ostringstream string_builder; ostringstream string_builder;
vector<string>::const_iterator word_iter; vector<string>::const_iterator word_iter;
for (word_iter = words.begin(); word_iter != words.end(); ++word_iter) { for (word_iter = words.begin(); word_iter != words.end(); ++word_iter) {
@@ -741,13 +742,14 @@ namespace opengl
width += currentFont->getWidth( word ); width += currentFont->getWidth( word );
// on wordwrap, push line to line buffer and clear string builder // on wordwrap, push line to line buffer and clear string builder
if (width >= wrap) { if (width >= wrap && oldwidth > 0) {
lines_to_draw.push_back( string_builder.str() ); lines_to_draw.push_back( string_builder.str() );
string_builder.str( "" ); string_builder.str( "" );
width = static_cast<float>(currentFont->getWidth( word )); width = static_cast<float>(currentFont->getWidth( word ));
} }
string_builder << word << " "; string_builder << word << " ";
width += width_space; width += width_space;
oldwidth = width;
} }
// push last line // push last line
lines_to_draw.push_back( string_builder.str() ); lines_to_draw.push_back( string_builder.str() );