akkartik
/
capture.love
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix 

I'd wrapped currx in two conditionals, and not noticed that it gets
reclaimed within the other.

The hint is clearly more work than it's worth. Just take it out.
This commit is contained in:
Kartik K. Agaram 2022-05-20 08:02:03 -07:00
parent 3ec8019cc0
commit 1c20d514f2
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
text.lua
View File

@ -226,7 +226,7 @@ function Text.keychord_pressed(chord)
if Lines[new_cursor_line].mode == 'text' then if Lines[new_cursor_line].mode == 'text' then
local old_x = Text.cursor_x(Lines[new_cursor_line].data, Cursor_pos) local old_x = Text.cursor_x(Lines[new_cursor_line].data, Cursor_pos)
Cursor_line = new_cursor_line Cursor_line = new_cursor_line
Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, old_x, Cursor_pos) Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, old_x)
break break
end end
end end
@ -242,7 +242,7 @@ function Text.keychord_pressed(chord)
if Lines[new_cursor_line].mode == 'text' then if Lines[new_cursor_line].mode == 'text' then
local old_x = Text.cursor_x(Lines[new_cursor_line].data, Cursor_pos) local old_x = Text.cursor_x(Lines[new_cursor_line].data, Cursor_pos)
Cursor_line = new_cursor_line Cursor_line = new_cursor_line
Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, old_x, Cursor_pos) Cursor_pos = Text.nearest_cursor_pos(Lines[Cursor_line].data, old_x)
break break
end end
end end
@ -336,7 +336,7 @@ end
-- nearest_cursor_pos('gh', mx) = 2 -- nearest_cursor_pos('gh', mx) = 2
-- Cursor_pos = 7 + 2 - 1 = 8 -- Cursor_pos = 7 + 2 - 1 = 8
function Text.nearest_cursor_pos(line, x, hint) function Text.nearest_cursor_pos(line, x)
if x == 0 then if x == 0 then
return 1 return 1
end end
@ -345,20 +345,7 @@ function Text.nearest_cursor_pos(line, x, hint)
if x > max_x then if x > max_x then
return len+1 return len+1
end end
if hint then
local currx = Text.cursor_x(line, hint)
if currx > x-2 and currx < x+2 then
return hint
end
end
local left, right = 1, len+1 local left, right = 1, len+1
if hint then
if currx > x then
right = hint
else
left = hint
end
end
--? print('--') --? print('--')
while true do while true do
local curr = math.floor((left+right)/2) local curr = math.floor((left+right)/2)