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

Remove the undocumented formatted variant of Text:set (Text:setf still exists). Resolves issue #1329.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-14 18:41:22 -03:00
parent 92df39181d
commit fea9f82cfa
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Text.cpp
+3 -22
View File
@@ -36,29 +36,10 @@ int w_Text_set(lua_State *L)
{ {
Text *t = luax_checktext(L, 1); Text *t = luax_checktext(L, 1);
if (lua_isnoneornil(L, 3)) std::vector<Font::ColoredString> newtext;
{ luax_checkcoloredstring(L, 2, newtext);
// Single argument: unformatted text.
std::vector<Font::ColoredString> newtext;
luax_checkcoloredstring(L, 2, newtext);
luax_catchexcept(L, [&](){ t->set(newtext); });
}
else
{
// Multiple arguments: formatted text.
float wraplimit = (float) luaL_checknumber(L, 3);
Font::AlignMode align;
const char *alignstr = luaL_checkstring(L, 4);
if (!Font::getConstant(alignstr, align))
return luaL_error(L, "Invalid align mode: %s", alignstr);
std::vector<Font::ColoredString> newtext;
luax_checkcoloredstring(L, 2, newtext);
luax_catchexcept(L, [&](){ t->set(newtext, wraplimit, align); });
}
luax_catchexcept(L, [&](){ t->set(newtext); });
return 0; return 0;
} }