diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2023-07-31 08:29:11 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2023-07-31 08:40:22 -0700 |
| commit | d6c06db97a89efff37d9d1c1d92669c5ab945dba (patch) | |
| tree | b4680b01c943c82839fb4f3a60eae464dca9409f | |
| parent | f7f42b0befc3fbe6c425cfa8bad18192c2beb926 (diff) | |
| download | view.love-d6c06db97a89efff37d9d1c1d92669c5ab945dba.tar.gz | |
bugfix: highlight search patterns on the right line
scenario: * position a wrapped line on screen * search for the word immediately after the point of wrapping Before this commit the word would be highlighted twice: - at the end of the first screen line - at the start of the second screen line Now it shows up at the right place.
| -rw-r--r-- | source_text.lua | 9 | ||||
| -rw-r--r-- | text.lua | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/source_text.lua b/source_text.lua index 9e3a9ac..98045be 100644 --- a/source_text.lua +++ b/source_text.lua @@ -54,7 +54,7 @@ function Text.draw(State, line_index, y, startpos, hide_cursor) if not hide_cursor and line_index == State.cursor1.line then -- render search highlight or cursor if State.search_term then - if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then + if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then local data = State.lines[State.cursor1.line].data local cursor_offset = Text.offset(data, State.cursor1.pos) if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then @@ -64,7 +64,12 @@ function Text.draw(State, line_index, y, startpos, hide_cursor) end end elseif Focus == 'edit' then - if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then + if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then + Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y) + elseif pos + frag_len == State.cursor1.pos then + -- Show cursor at end of line. + -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing. + -- It seems useful to see a cursor whether your eye is on the left or right margin. Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y) end end diff --git a/text.lua b/text.lua index 8da0586..2825dac 100644 --- a/text.lua +++ b/text.lua @@ -32,7 +32,7 @@ function Text.draw(State, line_index, y, startpos) if line_index == State.cursor1.line then -- render search highlight or cursor if State.search_term then - if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then + if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then local data = State.lines[State.cursor1.line].data local cursor_offset = Text.offset(data, State.cursor1.pos) if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then @@ -42,7 +42,12 @@ function Text.draw(State, line_index, y, startpos) end end else - if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then + if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then + Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y) + elseif pos + frag_len == State.cursor1.pos then + -- Show cursor at end of line. + -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing. + -- It seems useful to see a cursor whether your eye is on the left or right margin. Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y) end end |