josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add BufferPane::determine_new_cursor_screen_row() to allow the cursor to move properly within the screen

Browse Source
This commit is contained in:
Josh Holtrop 2016-12-25 13:01:40 -05:00
parent 83a6c1a983
commit e21c24e2cc
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/BufferPane.cc
View File

@ -145,6 +145,31 @@ int BufferPane::update_cursor_row(std::list<std::pair<int, Buffer::Iterator>> &
return cursor_row_offset; return cursor_row_offset;
} }
int BufferPane::determine_new_cursor_screen_row()
{
if (m_screen_lines.size() > 0)
{
if (m_iterator->line() < m_screen_lines.begin()->second.line())
{
return 0;
}
if (m_iterator->line() > m_screen_lines.rbegin()->second.line())
{
return m_rows;
}
for (auto screen_line : m_screen_lines)
{
if (screen_line.second.line() == m_iterator->line())
{
int row_offset;
rows_in_line_with_iterator_offset(screen_line.second, *m_iterator, &row_offset);
return screen_line.first + row_offset;
}
}
}
return 0;
}
void BufferPane::draw() void BufferPane::draw()
{ {
m_screen_lines.clear(); m_screen_lines.clear();
@ -334,6 +359,7 @@ void BufferPane::cursor_move(CursorMovement which)
} }
if (moved) if (moved)
{ {
m_cursor_screen_row = determine_new_cursor_screen_row();
m_window->request_redraw(); m_window->request_redraw();
} }
} }

1
src/gui/BufferPane.h
View File

@ -43,6 +43,7 @@ protected:
int screen_rows_above_line(const Buffer::Iterator & line, std::list<std::pair<int, Buffer::Iterator>> & backward_lines); int screen_rows_above_line(const Buffer::Iterator & line, std::list<std::pair<int, Buffer::Iterator>> & backward_lines);
int update_cursor_row(std::list<std::pair<int, Buffer::Iterator>> & backward_lines); int update_cursor_row(std::list<std::pair<int, Buffer::Iterator>> & backward_lines);
void walk_line(const Buffer::Iterator & start_of_line, std::function<void(int, int, int, int, const Buffer::Iterator &)> callback); void walk_line(const Buffer::Iterator & start_of_line, std::function<void(int, int, int, int, const Buffer::Iterator &)> callback);
int determine_new_cursor_screen_row();
int col_x(int col) int col_x(int col)
{ {
return col * m_window->font()->get_advance(); return col * m_window->font()->get_advance();