Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-19 08:30:25 +02:00
Code Activity

Improved #region collapse behavior

Browse source
This commit is contained in:
Brian Fiete 2022-03-02 12:10:16 -08:00
parent 5fc95f8f07
commit 6fe9c97649
3 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
IDE/src/ui/SourceEditWidgetContent.bf
View file

@ -219,9 +219,6 @@ namespace IDE.ui
public void FixAfterUpdate() mut
{
if (mKind == .Region)
mStartLine++;
if (mAnchorLine == mEndLine)
{
mDeleted = true;
@ -5073,6 +5070,8 @@ namespace IDE.ui
int32 closeDepth = 0;
int32 curAnimLineIdx = 0;
bool inAnim = false;
int checkOpenIdx = 0;
for (int line < data.mLineStarts.Count)
{
while (curIdx < mOrderedCollapseEntries.Count)
@ -5086,27 +5085,30 @@ namespace IDE.ui
if (entry.mAnchorLine > line)
break;
checkOpenIdx = Math.Min(checkOpenIdx, collapseStack.Count);
collapseStack.Add(curIdx);
curIdx++;
}
bool deferClose = false;
if (!collapseStack.IsEmpty)
while (checkOpenIdx < collapseStack.Count)
{
int32 activeIdx = collapseStack.Back;
var entry = mOrderedCollapseEntries[activeIdx];
if (line == entry.mStartLine)
int32 checkIdx = collapseStack[checkOpenIdx];
var entry = mOrderedCollapseEntries[checkIdx];
if (line != entry.mStartLine)
break;
checkOpenIdx++;
if (checkIdx == animIdx)
inAnim = true;
if ((!entry.mIsOpen) && (checkIdx != animIdx))
{
if (activeIdx == animIdx)
inAnim = true;
if ((!entry.mIsOpen) && (activeIdx != animIdx))
{
if ((closeDepth == 0) && (entry.mAnchorLine == entry.mStartLine))
deferClose = true;
else
closeDepth++;
}
if ((closeDepth == 0) && (entry.mAnchorLine == entry.mStartLine))
deferClose = true;
else
closeDepth++;
}
}