Skip to content

Add password input option #71

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
fituldo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add password input option #71

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
12 changes: 8 additions & 4 deletions input.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ return function(core, input, ...)
h = h or opt.font:getHeight() + 4

input.text = input.text or ""
input.cursor = math.max(1, math.min(utf8.len(input.text)+1, input.cursor or utf8.len(input.text)+1))
local masked_or_normal = input.text
if input.masked then
masked_or_normal = string.rep("*", utf8.len(input.text))
end
input.cursor = math.max(1, math.min(utf8.len(masked_or_normal)+1, input.cursor or utf8.len(masked_or_normal)+1))
-- cursor is position *before* the character (including EOS) i.e. in "hello":
-- position 1: |hello
-- position 2: h|ello
Expand All @@ -28,7 +32,7 @@ return function(core, input, ...)
-- get size of text and cursor position
opt.cursor_pos = 0
if input.cursor > 1 then
local s = input.text:sub(1, utf8.offset(input.text, input.cursor)-1)
local s = masked_or_normal:sub(1, utf8.offset(masked_or_normal, input.cursor)-1)
opt.cursor_pos = opt.font:getWidth(s)
end

Expand Down Expand Up @@ -91,9 +95,9 @@ return function(core, input, ...)
-- move cursor position with mouse when clicked on
if core:mouseReleasedOn(opt.id) then
local mx = core:getMousePosition() - x + input.text_draw_offset
input.cursor = utf8.len(input.text) + 1
input.cursor = utf8.len(masked_or_normal) + 1
for c = 1,input.cursor do
local s = input.text:sub(0, utf8.offset(input.text, c)-1)
local s = masked_or_normal:sub(0, utf8.offset(masked_or_normal, c)-1)
if opt.font:getWidth(s) >= mx then
input.cursor = c-1
break
Expand Down
7 changes: 6 additions & 1 deletion theme.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@ function theme.Input(input, opt, x,y,w,h)
-- text
love.graphics.setColor((opt.color and opt.color.normal and opt.color.normal.fg) or theme.color.normal.fg)
love.graphics.setFont(opt.font)
love.graphics.print(input.text, x, y+(h-th)/2)

local masked_or_normal = input.text
if input.masked then
masked_or_normal = string.rep("*", utf8.len(input.text))
end
love.graphics.print(masked_or_normal, x, y+(h-th)/2)

-- candidate text
local tw = opt.font:getWidth(input.text)
Expand Down