Skip to content

use utf8.len in ParseHeaderText and ParseRowText functions #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
izarif wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use utf8.len in ParseHeaderText and ParseRowText functions #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions loveframes/skins/Blue/skin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 6 additions & 4 deletions loveframes/skins/Default/skin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down