Skip to content
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

Fixed vertical text alignment for multiline/wrapping text #89

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

Fixed vertical text alignment for multiline/wrapping text #89

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
24 changes: 14 additions & 10 deletions theme.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,29 @@ function theme.drawBox(x,y,w,h, colors, cornerRadius)
love.graphics.rectangle('fill', x,y, w,h, cornerRadius)
end

function theme.getVerticalOffsetForAlign(valign, font, h)
function theme.getVerticalOffsetForAlign(valign, textHeight, h)
if valign == "top" then
return 0
elseif valign == "bottom" then
return h - font:getHeight()
return h - textHeight
end
-- else: "middle"
return (h - font:getHeight()) / 2
return (h - textHeight) / 2
end

function theme.printFormattedAligned(text, x, y, w, h, align, valign)
local textObj = love.graphics.newText(love.graphics.getFont())
textObj:addf(text, w, align, 0, 0)
y = y + theme.getVerticalOffsetForAlign(valign, textObj:getHeight(), h)
love.graphics.draw(textObj, x, y)
end

-- WIDGET VIEWS
function theme.Label(text, opt, x,y,w,h)
y = y + theme.getVerticalOffsetForAlign(opt.valign, opt.font, h)

love.graphics.setColor((opt.color and opt.color.normal or {}).fg or theme.color.normal.fg)
love.graphics.setFont(opt.font)
love.graphics.printf(text, x+2, y, w-4, opt.align or "center")

theme.printFormattedAligned(text, x+2, y, w-4, h, opt.align or "center", opt.valign)
end

function theme.Button(text, opt, x,y,w,h)
Expand All @@ -56,8 +62,7 @@ function theme.Button(text, opt, x,y,w,h)
love.graphics.setColor(c.fg)
love.graphics.setFont(opt.font)

y = y + theme.getVerticalOffsetForAlign(opt.valign, opt.font, h)
love.graphics.printf(text, x+2, y, w-4, opt.align or "center")
theme.printFormattedAligned(text, x+2, y, w-4, h, opt.align or "center", opt.valign)
end

function theme.Checkbox(chk, opt, x,y,w,h)
Expand All @@ -75,8 +80,7 @@ function theme.Checkbox(chk, opt, x,y,w,h)

if chk.text then
love.graphics.setFont(opt.font)
y = y + theme.getVerticalOffsetForAlign(opt.valign, opt.font, h)
love.graphics.printf(chk.text, x + h, y, w - h, opt.align or "left")
theme.printFormattedAligned(chk.text, x + h, y, w - h, opt.align or "left", opt.valign)
end
end

Expand Down