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

Fix Window::scroll_to_keep_cursor_visible_ifn

Browse Source
This commit is contained in:
Maxime Coste 2012-05-29 00:14:05 +00:00
parent 7451423ce3
commit 6fa40796e7
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/window.cc
View File

@ -93,24 +93,16 @@ void Window::set_dimensions(const DisplayCoord& dimensions)
void Window::scroll_to_keep_cursor_visible_ifn() void Window::scroll_to_keep_cursor_visible_ifn()
{ {
DisplayCoord cursor = line_and_column_at(selections().back().last()); BufferCoord cursor = buffer().line_and_column_at(selections().back().last());
if (cursor.line < 0) if (cursor.line < m_position.line)
{ m_position.line = cursor.line;
m_position.line = std::max(m_position.line + cursor.line, 0); else if (cursor.line >= m_position.line + m_dimensions.line)
} m_position.line = cursor.line - (m_dimensions.line - 1);
else if (cursor.line >= m_dimensions.line)
{
m_position.line += cursor.line - (m_dimensions.line - 1);
}
if (cursor.column < 0) if (cursor.column < m_position.column)
{ m_position.column = cursor.column;
m_position.column = std::max(m_position.column + cursor.column, 0); else if (cursor.column >= m_position.column + m_dimensions.column)
} m_position.column = cursor.column - (m_dimensions.column - 1);
else if (cursor.column >= m_dimensions.column)
{
m_position.column += cursor.column - (m_dimensions.column - 1);
}
} }
String Window::status_line() const String Window::status_line() const