Reworking line numbers + other fixes #2088
Conversation
…rmance improvements.
| private ScrollView _scrollView; | ||
| private int _x; | ||
| private int _maxLineNumber = 1; | ||
| private int _maxLineNumberWidth; |
There was a problem hiding this comment.
Removed need for many vars
| CharSequence deleted = s.subSequence(start, start + count); | ||
| matcher = pattern.matcher(deleted); | ||
| while (matcher.find()) { | ||
| _maxLineNumber--; |
There was a problem hiding this comment.
Removed need for change tracking
| int number = 1; | ||
| int yPos = top; | ||
|
|
||
| while(line < maxLayoutLine && yPos < bottom) { |
There was a problem hiding this comment.
Simplified loop. Basic logic is same though
harshad1
changed the title
|
@guang-lin @gsantner This seems to be working fine except for line numbers in view mode. Line numbers in view mode appear to be broken in the original branch too though. Feel free to merge this branch if you prefer or pull changes from here into other branches if desired. |
|
It seems that you improved a lot, I will take a look carefully. |
|
would be also OK to merge the version fron guang-lin to master and then just harshads branch on top for improvements again |
|
That is perfectly fine by me. Note that this branch includes all of @guang-lin's commits |
|
Also note that I made some more changes to how we do the numbering this morning. It is somewhat more efficient / faster now. The earlier version it was possible to see some drops if you fast scrolled through a very large file |
|
Changed the branch to linenumbers branch. Merged the initial PR and improvements can be continued via additional PRs to linenumbers branch. Then we can merge it to master when we think it's fine. For this PR tried rebasing, but there were quite a lot conflicts. However a merge-resolve seems to be only resolving conflicts in 3 files. |
|
These changes are already integrated into guang's branch right? So this one can be closed I guess. I think you also have the possibility to directly commit to the guang PR branch via git@github.com:guang remote. |
|
Closing as all commits have been moved |
@gsantner @guang-lin
I reworked some of the line number stuff in this PR:
Please take a look and feel free to take anything you feel is useful.