tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 15:54:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix hanging issue while hiding lines

Browse Source 
Fix #15630, close #15632
This commit is contained in:
Adrian Kulawik 2024-09-15 17:23:13 +02:00 committed by Don Ho
parent bfe835e8a4
commit 5d2bea5b97
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -3968,9 +3968,12 @@ void ScintillaEditView::hideLines()
size_t startMarker = startLine - 1; size_t startMarker = startLine - 1;
size_t endMarker = endLine + 1; size_t endMarker = endLine + 1;
// Remove all previous markers in between new ones // Previous markers must be removed in the selected region:
removeMarker(startMarker, 1 << MARK_HIDELINESBEGIN);
for (size_t i = startLine; i <= endLine; ++i) for (size_t i = startLine; i <= endLine; ++i)
removeMarker(i, (1 << MARK_HIDELINESBEGIN) | (1 << MARK_HIDELINESEND)); removeMarker(i, (1 << MARK_HIDELINESBEGIN) | (1 << MARK_HIDELINESEND));
removeMarker(endMarker, 1 << MARK_HIDELINESEND);
// When hiding lines just below/above other hidden lines, // When hiding lines just below/above other hidden lines,
// merge them into one hidden section: // merge them into one hidden section:
@ -3980,10 +3983,10 @@ void ScintillaEditView::hideLines()
// Special case: user wants to hide every line in between other hidden sections. // Special case: user wants to hide every line in between other hidden sections.
// Both "while" loops are executed (merge with above AND below hidden section): // Both "while" loops are executed (merge with above AND below hidden section):
while (scope == 0) while (scope == 0 && static_cast<intptr_t>(startMarker) >= 0)
removeMarker(--startMarker, 1 << MARK_HIDELINESBEGIN); removeMarker(--startMarker, 1 << MARK_HIDELINESBEGIN);
while (scope != 0) while (scope != 0 && endMarker < nbLines)
removeMarker(++endMarker, 1 << MARK_HIDELINESEND); removeMarker(++endMarker, 1 << MARK_HIDELINESEND);
} }
else else
@ -3991,10 +3994,10 @@ void ScintillaEditView::hideLines()
// User wants to hide some lines below/above other hidden section. // User wants to hide some lines below/above other hidden section.
// If true, only one "while" loop is executed (merge with adjacent hidden section): // If true, only one "while" loop is executed (merge with adjacent hidden section):
while (scope < 0) while (scope < 0 && static_cast<intptr_t>(startMarker) >= 0)
removeMarker(--startMarker, 1 << MARK_HIDELINESBEGIN); removeMarker(--startMarker, 1 << MARK_HIDELINESBEGIN);
while (scope > 0) while (scope > 0 && endMarker < nbLines)
removeMarker(++endMarker, 1 << MARK_HIDELINESEND); removeMarker(++endMarker, 1 << MARK_HIDELINESEND);
} }