mirrors/love-luigi
1
0
Fork 0
mirror of https://github.com/airstruck/luigi.git synced 2025-11-18 12:25:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix utf8 text input

Browse Source
This commit is contained in:
airstruck
2015-11-12 17:43:57 -05:00
parent b706f663e4
commit 97b2332d47
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/main.lua
View File

@@ -95,7 +95,7 @@ local mainForm = { id = 'mainWindow', type = 'panel',
},
{ type = 'sash', height = 4, },
{ type = 'panel', flow = 'x', height = 48, padding = 2,
{ type = 'text', id = 'aTextField', text = 'a text field' },
{ type = 'text', id = 'aTextField', text = 'Testing «ταБЬℓσ»: 1<2 & 4+1>3, now 20% off!', font = 'font/liberation/LiberationMono-Regular.ttf' },
{ type = 'button', key='return', width = 80, id = 'aButton', text = 'Styling!',
font = 'font/liberation/LiberationMono-Regular.ttf' },
},

27
luigi/widget/text.lua
View File

@@ -47,20 +47,30 @@ local function findCaretFromPoint (self, x, y)
local font = self.fontData.font
local width, lastWidth = 0
local characters = utf8.codes(self.value)
local lastPosition = 0
for position in utf8.codes(self.value) do
local index = utf8.offset(self.value, position)
text = self.value:sub(1, index)
local function checkPosition (position)
local text = self.value:sub(1, position - 1)
lastWidth = width
width = font:getWidth(text)
if width > x + self.scrollX - x1 then
if position == 1 then
return 0, x1 - self.scrollX
end
return utf8.offset(self.value, position - 1), lastWidth + x1 - self.scrollX
return lastPosition, lastWidth + x1 - self.scrollX
end
lastPosition = position - 1
end
for position in utf8.codes(self.value) do
local a, b = checkPosition(position)
if a then return a, b end
end
local a, b = checkPosition(#self.value + 1)
if a then return a, b end
return #self.value, width + x1 - self.scrollX
end
@@ -75,9 +85,9 @@ local function moveCaretLeft (self, alterRange)
-- move left
local mode = alterRange and 'end'
local offset = utf8.offset(text, -1, endIndex) or 0
local offset = utf8.offset(text, -1, endIndex + 1) or 0
setCaretFromText(self, text:sub(1, offset), mode)
setCaretFromText(self, text:sub(1, offset - 1), mode)
end
-- move the caret one character to the right
@@ -90,11 +100,10 @@ local function moveCaretRight (self, alterRange)
end
local mode = alterRange and 'end'
local offset = endIndex < 1 and utf8.offset(text, 1)
or utf8.offset(text, 2, endIndex) or #text
local offset = utf8.offset(text, 2, endIndex + 1) or #text
-- move right
setCaretFromText(self, text:sub(1, offset), mode)
setCaretFromText(self, text:sub(1, offset - 1), mode)
end
local function getRange (self)