diff --git a/loveframes/skins/Blue/skin.lua b/loveframes/skins/Blue/skin.lua index 6e8830e..55326a2 100644 --- a/loveframes/skins/Blue/skin.lua +++ b/loveframes/skins/Blue/skin.lua @@ -162,10 +162,11 @@ local function ParseHeaderText(str, hx, hwidth, tx) local font = love.graphics.getFont() local twidth = love.graphics.getFont():getWidth(str) + local strLen = loveframes.utf8.len(str) if (tx + twidth) - hwidth/2 > hx + hwidth then - if #str > 1 then - return ParseHeaderText(loveframes.utf8.sub(str, 1, #str - 1), hx, hwidth, tx, twidth) + if strLen > 1 then + return ParseHeaderText(loveframes.utf8.sub(str, 1, strLen - 1), hx, hwidth, tx, twidth) else return str end @@ -178,10 +179,11 @@ end local function ParseRowText(str, rx, rwidth, tx1, tx2) local twidth = love.graphics.getFont():getWidth(str) + local strLen = loveframes.utf8.len(str) if (tx1 + tx2) + twidth > rx + rwidth then - if #str > 1 then - return ParseRowText(loveframes.utf8.sub(str, 1, #str - 1), rx, rwidth, tx1, tx2) + if strLen > 1 then + return ParseRowText(loveframes.utf8.sub(str, 1, strLen - 1), rx, rwidth, tx1, tx2) else return str end diff --git a/loveframes/skins/Default/skin.lua b/loveframes/skins/Default/skin.lua index 54f4b53..ec10b15 100644 --- a/loveframes/skins/Default/skin.lua +++ b/loveframes/skins/Default/skin.lua @@ -42,10 +42,11 @@ local function ParseHeaderText(str, hx, hwidth, tx) local font = love.graphics.getFont() local twidth = love.graphics.getFont():getWidth(str) + local strLen = loveframes.utf8.len(str) if (tx + twidth) - hwidth/2 > hx + hwidth then - if #str > 1 then - return ParseHeaderText(loveframes.utf8.sub(str, 1, #str - 1), hx, hwidth, tx, twidth) + if strLen > 1 then + return ParseHeaderText(loveframes.utf8.sub(str, 1, strLen - 1), hx, hwidth, tx, twidth) else return str end @@ -58,10 +59,11 @@ end local function ParseRowText(str, rx, rwidth, tx1, tx2) local twidth = love.graphics.getFont():getWidth(str) + local strLen = loveframes.utf8.len(str) if (tx1 + tx2) + twidth > rx + rwidth then - if #str > 1 then - return ParseRowText(loveframes.utf8.sub(str, 1, #str - 1), rx, rwidth, tx1, tx2) + if strLen > 1 then + return ParseRowText(loveframes.utf8.sub(str, 1, strLen - 1), rx, rwidth, tx1, tx2) else return str end