Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 12 Jun 2015 16:18:21 UTC Commit: 7006bdfd8ca696f7f53328cc7f0414fefe9ca94a https://github.com/geany/geany/commit/7006bdfd8ca696f7f53328cc7f0414fefe9ca9...
Log Message: ----------- Sync the fold_changed() implementation with SciTE
SciTE added the SCI_GETALLLINESVISIBLE check in revision 8dc4127cc8d76ecdf988928ac34e79955c09bda4:
"Minimize cost of processing fold level changes to ensure visibility for the common case where the whole document is already visible."
When nothing is folded, this improves the performance considerably which is visible e.g. when pasting larger amounts of text.
Closes #507.
Modified Paths: -------------- src/editor.c
Modified: src/editor.c 28 lines changed, 16 insertions(+), 12 deletions(-) =================================================================== @@ -884,7 +884,8 @@ static void fold_changed(ScintillaObject *sci, gint line, gint levelNow, gint le { /* Adding a fold point */ SSM(sci, SCI_SETFOLDEXPANDED, line, 1); - expand(sci, &line, TRUE, FALSE, 0, levelPrev); + if (!SSM(sci, SCI_GETALLLINESVISIBLE, 0, 0)) + expand(sci, &line, TRUE, FALSE, 0, levelPrev); } } else if (levelPrev & SC_FOLDLEVELHEADERFLAG) @@ -893,22 +894,25 @@ static void fold_changed(ScintillaObject *sci, gint line, gint levelNow, gint le { /* Removing the fold from one that has been contracted so should expand * otherwise lines are left invisible with no way to make them visible */ SSM(sci, SCI_SETFOLDEXPANDED, line, 1); - expand(sci, &line, TRUE, FALSE, 0, levelPrev); + if (!SSM(sci, SCI_GETALLLINESVISIBLE, 0, 0)) + expand(sci, &line, TRUE, FALSE, 0, levelPrev); } } if (! (levelNow & SC_FOLDLEVELWHITEFLAG) && ((levelPrev & SC_FOLDLEVELNUMBERMASK) > (levelNow & SC_FOLDLEVELNUMBERMASK))) { - /* See if should still be hidden */ - gint parentLine = sci_get_fold_parent(sci, line); - if (parentLine < 0) - { - SSM(sci, SCI_SHOWLINES, line, line); - } - else if (sci_get_fold_expanded(sci, parentLine) && - sci_get_line_is_visible(sci, parentLine)) - { - SSM(sci, SCI_SHOWLINES, line, line); + if (!SSM(sci, SCI_GETALLLINESVISIBLE, 0, 0)) { + /* See if should still be hidden */ + gint parentLine = sci_get_fold_parent(sci, line); + if (parentLine < 0) + { + SSM(sci, SCI_SHOWLINES, line, line); + } + else if (sci_get_fold_expanded(sci, parentLine) && + sci_get_line_is_visible(sci, parentLine)) + { + SSM(sci, SCI_SHOWLINES, line, line); + } } } }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).