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

Fixed recent files when closing files (ended up with a bunch of seps)

Browse source
This commit is contained in:
Brian Fiete 2020-05-06 17:01:06 -07:00
parent 421a324666
commit 657e758ec1
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDE/src/ui/SourceViewPanel.bf
View file

@ -2289,7 +2289,7 @@ namespace IDE.ui
public void FocusEdit() public void FocusEdit()
{ {
let activePanel = GetActivePanel(); let activePanel = GetActivePanel();
activePanel.mEditWidget.SetFocus(); activePanel.mEditWidget?.SetFocus();
if (!mWidgetWindow.mHasFocus) if (!mWidgetWindow.mHasFocus)
EditGotFocus(); EditGotFocus();

28
IDE/src/util/RecentFiles.bf
View file

@ -42,6 +42,11 @@ namespace IDE.util
public static void UpdateMenu(List<String> items, SysMenu menu, List<SysMenu> menuItems, delegate void(int idx, SysMenu sysMenu) onNewEntry) public static void UpdateMenu(List<String> items, SysMenu menu, List<SysMenu> menuItems, delegate void(int idx, SysMenu sysMenu) onNewEntry)
{ {
if ((menuItems.IsEmpty) && (!items.IsEmpty))
{
menuItems.Add(menu.AddMenuItem(null, null));
}
int32 i; int32 i;
for (i = 0; i < items.Count; i++) for (i = 0; i < items.Count; i++)
{ {
@ -50,15 +55,12 @@ namespace IDE.util
title.AppendF("1&0 {1}", i + 1, items[i]); title.AppendF("1&0 {1}", i + 1, items[i]);
else else
title.AppendF("&{0} {1}", i + 1, items[i]); title.AppendF("&{0} {1}", i + 1, items[i]);
if (i < menuItems.Count) if (i < menuItems.Count - 1)
{ {
menuItems[i].Modify(title); menuItems[i + 1].Modify(title);
} }
else else
{ {
if ((menuItems.IsEmpty) && (menu.mChildren != null) && (!menu.mChildren.IsEmpty))
menu.AddMenuItem(null, null);
int32 idx = i; int32 idx = i;
let newMenuItem = menu.AddMenuItem(title); let newMenuItem = menu.AddMenuItem(title);
@ -69,17 +71,23 @@ namespace IDE.util
} }
} }
while (i < menuItems.Count) while (i < menuItems.Count - 1)
{ {
menuItems[i].Dispose(); menuItems[i + 1].Dispose();
menuItems.RemoveAt(i); menuItems.RemoveAt(i + 1);
} }
if (menu.ChildCount == 0) if ((!menuItems.IsEmpty) && (items.IsEmpty))
{
menuItems[0].Dispose();
menuItems.Clear();
}
/*if (menu.ChildCount == 0)
{ {
let newMenuItem = menu.AddMenuItem("< None >", null, null, null, null, false); let newMenuItem = menu.AddMenuItem("< None >", null, null, null, null, false);
menuItems.Add(newMenuItem); menuItems.Add(newMenuItem);
} }*/
} }
public static void Add(List<String> list, StringView path, int32 maxCount = 10) public static void Add(List<String> list, StringView path, int32 maxCount = 10)