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

Merge text0

This commit is contained in:
Kartik K. Agaram 2023-04-08 23:00:47 -07:00
parent f44f3b0a4a 2700149407
commit 6495afad91
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
text.lua
View File

@ -22,19 +22,18 @@ function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
App.color(fg)
if pos < startpos then
-- render nothing
--? print('skipping', f)
else
final_screen_line_starting_pos = pos
local f = Text.screen_line(line, line_cache, i)
--? print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
local frag_len = utf8.len(f)
local screen_line = Text.screen_line(line, line_cache, i)
--? print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
local frag_len = utf8.len(screen_line)
-- render fragment
if State.selection1.line then
local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
end
App.color(Text_color)
App.screen.print(f, State.left,y)
App.screen.print(screen_line, State.left,y)
-- render cursor if necessary
if line_index == State.cursor1.line then
if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
@ -45,7 +44,7 @@ function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
love.graphics.print(State.search_term, State.left+lo_px,y)
end
elseif not hide_cursor then
Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y, Cursor_color, fg)
Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color, fg)
end
end
end