xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap: simplify logic a bit and fix case where too many lines got displayed

Browse Source 
Fixes #1710
This commit is contained in:
Maxime Coste 2017-11-21 13:01:02 +08:00
parent b57a53dfbf
commit 77b367b3e0
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/highlighters.cc
View File

@ -752,14 +752,15 @@ struct WrapHighlighter : Highlighter
return count; return count;
}; };
const auto win_height = context.window().dimensions().line;
// Disable horizontal scrolling when using a WrapHighlighter // Disable horizontal scrolling when using a WrapHighlighter
setup.cursor_pos.column += setup.window_pos.column;
setup.window_pos.column = 0; setup.window_pos.column = 0;
setup.window_range.line = win_height;
setup.scroll_offset.column = 0; setup.scroll_offset.column = 0;
setup.full_lines = true; setup.full_lines = true;
LineCount win_line = 0; for (auto buf_line = setup.window_pos.line, win_line = 0_line;
for (auto buf_line = setup.window_pos.line;
buf_line < setup.window_pos.line + setup.window_range.line or buf_line < setup.window_pos.line + setup.window_range.line or
buf_line <= cursor.line; buf_line <= cursor.line;
++buf_line) ++buf_line)
@ -801,20 +802,14 @@ struct WrapHighlighter : Highlighter
while (buf_line >= cursor.line and setup.window_pos.line < cursor.line and while (buf_line >= cursor.line and setup.window_pos.line < cursor.line and
cursor.line + setup.scroll_offset.line >= setup.window_pos.line + setup.window_range.line) cursor.line + setup.scroll_offset.line >= setup.window_pos.line + setup.window_range.line)
{ {
auto removed_lines = std::min(context.window().dimensions().line, auto remove_count = std::min(win_height, 1 + line_wrap_count(setup.window_pos.line, indent));
1 + line_wrap_count(setup.window_pos.line++, indent)); ++setup.window_pos.line;
setup.cursor_pos.line -= removed_lines; setup.cursor_pos.line -= remove_count;
win_line -= removed_lines; win_line -= remove_count;
// removed one line from the range, added removed_lines potential ones // removed one line from the range, added remove_count potential ones
setup.window_range.line += removed_lines - 1; setup.window_range.line += remove_count - 1;
kak_assert(setup.cursor_pos.line >= 0); kak_assert(setup.cursor_pos.line >= 0);
} }
if (setup.window_range.line <= buf_line - setup.window_pos.line)
setup.window_range.line = buf_line - setup.window_pos.line + 1;
// Todo: support displaying partial lines, so that we can ensure the cursor is
// visible even if a line takes more than the full screen height once wrapped.
// kak_assert(setup.cursor_pos.line >= 0 and setup.cursor_pos.line < win_height);
} }
} }