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

Fix font scaling newline issue (bug #56)

Browse Source
This commit is contained in:
Bart van Strien
2010-09-22 10:45:34 +02:00
parent fe373075a4
commit d942ff3315
1 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+69 -3
View File
@@ -736,7 +736,29 @@ namespace opengl
if(currentFont != 0) if(currentFont != 0)
{ {
std::string text(str); std::string text(str);
currentFont->print(text, x, y, angle, 1, 1);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, 1, 1);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()), angle, 1, 1);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()), angle, 1, 1);
}
} }
} }
@@ -745,7 +767,29 @@ namespace opengl
if(currentFont != 0) if(currentFont != 0)
{ {
std::string text(str); std::string text(str);
currentFont->print(text, x, y, angle, s, s);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, s, s);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * s), angle, s, s);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * s), angle, s, s);
}
} }
} }
@@ -754,7 +798,29 @@ namespace opengl
if(currentFont != 0) if(currentFont != 0)
{ {
std::string text(str); std::string text(str);
currentFont->print(text, x, y, angle, sx, sy);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, sx, sy);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * sy), angle, sx, sy);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * sy), angle, sx, sy);
}
} }
} }