Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-15 06:44:10 +02:00
Code Activity

Clear bookmarks when workspace closes + fixed bookmark jump direction

Browse source
This commit is contained in:
Simon Lübeß 2022-06-09 18:41:02 +02:00
parent 09c31d5db1
commit bc286885dc
2 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

88
IDE/src/BookmarkManager.bf
View file

@ -343,6 +343,50 @@ namespace IDE
int32 currentFolderIdx = mFolderIdx; int32 currentFolderIdx = mFolderIdx;
int32 currentBookmarkIdx = mBookmarkIdx; int32 currentBookmarkIdx = mBookmarkIdx;
Bookmark prevBookmark = null;
repeat
{
mBookmarkIdx--;
if (mBookmarkIdx < 0)
{
if (!currentFolderOnly)
{
mFolderIdx--;
if (mFolderIdx < 0)
{
// wrap to last folder
mFolderIdx = (int32)mBookmarkFolders.Count - 1;
}
}
// Select last bookmark in current folder
mBookmarkIdx = (int32)mBookmarkFolders[mFolderIdx].mBookmarkList.Count - 1;
}
if (mBookmarkIdx >= 0)
prevBookmark = mBookmarkFolders[mFolderIdx].mBookmarkList[mBookmarkIdx];
else
prevBookmark = null;
}
// skip disabled bookmarks, stop when we reach starting point
while ((prevBookmark == null || prevBookmark.mIsDisabled) && ((currentFolderIdx != mFolderIdx) || (currentBookmarkIdx != mBookmarkIdx) && mBookmarkIdx != -1));
// If prevBookmark is disabled no bookmark is enabled.
if (prevBookmark != null && !prevBookmark.mIsDisabled)
GotoBookmark(prevBookmark);
}
public void NextBookmark(bool currentFolderOnly = false)
{
if (mBookmarkCount == 0)
return;
int32 currentFolderIdx = mFolderIdx;
int32 currentBookmarkIdx = mBookmarkIdx;
Bookmark nextBookmark = null; Bookmark nextBookmark = null;
repeat repeat
@ -379,50 +423,6 @@ namespace IDE
GotoBookmark(nextBookmark); GotoBookmark(nextBookmark);
} }
public void NextBookmark(bool currentFolderOnly = false)
{
if (mBookmarkCount == 0)
return;
int32 currentFolderIdx = mFolderIdx;
int32 currentBookmarkIdx = mBookmarkIdx;
Bookmark nextBookmark = null;
repeat
{
mBookmarkIdx--;
if (mBookmarkIdx < 0)
{
if (!currentFolderOnly)
{
mFolderIdx--;
if (mFolderIdx < 0)
{
// wrap to last folder
mFolderIdx = (int32)mBookmarkFolders.Count - 1;
}
}
// Select last bookmark in current folder
mBookmarkIdx = (int32)mBookmarkFolders[mFolderIdx].mBookmarkList.Count - 1;
}
if (mBookmarkIdx >= 0)
nextBookmark = mBookmarkFolders[mFolderIdx].mBookmarkList[mBookmarkIdx];
else
nextBookmark = null;
}
// skip disabled bookmarks, stop when we reach starting point
while ((nextBookmark == null || nextBookmark.mIsDisabled) && ((currentFolderIdx != mFolderIdx) || (currentBookmarkIdx != mBookmarkIdx) && mBookmarkIdx != -1));
// If nextBookmark is disabled no bookmark is enabled.
if (nextBookmark != null && !nextBookmark.mIsDisabled)
GotoBookmark(nextBookmark);
}
public void GotoBookmark(Bookmark bookmark) public void GotoBookmark(Bookmark bookmark)
{ {
mFolderIdx = (int32)mBookmarkFolders.IndexOf(bookmark.mFolder); mFolderIdx = (int32)mBookmarkFolders.IndexOf(bookmark.mFolder);

2
IDE/src/IDEApp.bf
View file

@ -2423,6 +2423,8 @@ namespace IDE
mBookmarksPanel.Clear(); mBookmarksPanel.Clear();
mBookmarkManager.Clear();
OutputLine("Workspace closed."); OutputLine("Workspace closed.");
} }