github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 13:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cap line number when requesting info from layout

Browse Source 
With the new constraint based layout, the gutter can issue line record requests before the layout has been updated to hold the new document buffer.
This commit is contained in:
Allan Odgaard
2012-09-21 15:16:31 +02:00
parent 8ea658b3cf
commit fbbe4ddac7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Frameworks/layout/src/layout.cc
View File

@@ -349,10 +349,11 @@ namespace ng
ng::line_record_t layout_t::line_record_for (text::pos_t const& pos) const
{
size_t index = _buffer.convert(text::pos_t(pos.line, 0)) + pos.column;
size_t n = std::min(pos.line, _buffer.lines()-1);
size_t index = _buffer.convert(text::pos_t(n, 0)) + std::min(pos.column, _buffer.end(n) - _buffer.begin(n));
auto row = row_for_offset(index);
if(row != _rows.end())
return row->value.line_record_for(pos.line, index, *_metrics, _buffer, row->offset._length, CGPointMake(_margin.left, _margin.top + row->offset._height));
return row->value.line_record_for(n, index, *_metrics, _buffer, row->offset._length, CGPointMake(_margin.left, _margin.top + row->offset._height));
return ng::line_record_t(0, 0, 0, 0, 0);
}