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

Removed the no-argument variant of Text:set() in favour of Text:clear(). Resolves issue #1126.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-08-20 09:17:14 -03:00
parent 22056271ec
commit daf13de4eb
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Text.cpp
+1 -6
View File
@@ -177,7 +177,7 @@ void Text::set(const std::vector<Font::ColoredString> &text)
void Text::set(const std::vector<Font::ColoredString> &text, float wrap, Font::AlignMode align)
{
if (text.empty() || (text.size() == 1 && text[0].str.empty()))
return set();
return clear();
Font::ColoredCodepoints codepoints;
Font::getCodepointsFromString(text, codepoints);
@@ -185,11 +185,6 @@ void Text::set(const std::vector<Font::ColoredString> &text, float wrap, Font::A
addTextData({codepoints, wrap, align, {}, false, false, Matrix3()});
}
void Text::set()
{
clear();
}
int Text::add(const std::vector<Font::ColoredString> &text, float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
{
return addf(text, -1.0f, Font::ALIGN_MAX_ENUM, x, y, angle, sx, sy, ox, oy, kx, ky);