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

Change scrolloff behaviour, allow displaying pas the end of buffer

Browse Source 
Fixes #306
This commit is contained in:
Maxime Coste 2015-07-07 22:36:27 +01:00
parent 1cbaac5323
commit 3c4400c5fd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/window.cc
View File

@ -129,17 +129,18 @@ static LineCount adapt_view_pos(LineCount line, LineCount offset,
LineCount view_pos, LineCount view_size, LineCount view_pos, LineCount view_size,
LineCount buffer_size) LineCount buffer_size)
{ {
offset = std::min(offset, (view_size + 1) / 2);
if (line - offset < view_pos) if (line - offset < view_pos)
return std::max(0_line, line - offset); return std::max(0_line, line - offset);
else if (line + offset >= view_pos + view_size) else if (line + offset >= view_pos + view_size)
return std::max(0_line, std::min(buffer_size - view_size, return std::max(0_line, line + offset - view_size);
line + offset - (view_size - 1)));
return view_pos; return view_pos;
} }
static CharCount adapt_view_pos(const DisplayBuffer& display_buffer, CharCount offset, static CharCount adapt_view_pos(const DisplayBuffer& display_buffer, CharCount offset,
ByteCoord pos, CharCount view_pos, CharCount view_size) ByteCoord pos, CharCount view_pos, CharCount view_size)
{ {
offset = std::min(offset, (view_size + 1) / 2);
CharCount buffer_column = 0; CharCount buffer_column = 0;
CharCount non_buffer_column = 0; CharCount non_buffer_column = 0;
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
@ -186,10 +187,7 @@ void Window::scroll_to_keep_selection_visible_ifn(const Context& context)
const auto& anchor = selection.anchor(); const auto& anchor = selection.anchor();
const auto& cursor = selection.cursor(); const auto& cursor = selection.cursor();
const CharCoord max_offset{(m_dimensions.line - 1)/2, const CharCoord offset = options()["scrolloff"].get<CharCoord>();
(m_dimensions.column - 1)/2};
const CharCoord offset = std::min(options()["scrolloff"].get<CharCoord>(),
max_offset);
// scroll lines if needed, try to get as much of the selection visible as possible // scroll lines if needed, try to get as much of the selection visible as possible
m_position.line = adapt_view_pos(anchor.line, offset.line, m_position.line, m_position.line = adapt_view_pos(anchor.line, offset.line, m_position.line,