Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-17 23:56:05 +02:00
Code Activity

Minor workspace folder tweaks

Browse source
This commit is contained in:
Brian Fiete 2022-01-18 12:01:56 -05:00
parent 7cea21af97
commit 3bb7f72116
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BeefLibs/Beefy2D/src/widgets/ListView.bf
View file

@ -957,8 +957,10 @@ namespace Beefy.widgets
} }
triedMove = true; triedMove = true;
case KeyCode.Down: case KeyCode.Down:
if (selectedItem.IsOpen) if ((selectedItem.IsOpen) && (!selectedItem.mChildItems.IsEmpty))
{
newSelection = selectedItem.mChildItems[0]; newSelection = selectedItem.mChildItems[0];
}
else else
{ {
while (selectedItem != mRoot) while (selectedItem != mRoot)

19
IDE/src/ui/ProjectPanel.bf
View file

@ -2353,12 +2353,7 @@ namespace IDE.ui
{ {
ListViewItem selectedListViewItem = mListView.GetRoot().FindFocusedItem(); ListViewItem selectedListViewItem = mListView.GetRoot().FindFocusedItem();
if (selectedListViewItem != null) if (selectedListViewItem != null)
{ EditListViewItem(selectedListViewItem);
ProjectItem projectItem;
mListViewToProjectMap.TryGetValue(selectedListViewItem, out projectItem);
if (projectItem != null)
RenameItem(projectItem);
}
} }
bool IsWorkspaceFolderNameUnique(String name, ListViewItem currentItem = null) bool IsWorkspaceFolderNameUnique(String name, ListViewItem currentItem = null)
@ -2381,10 +2376,12 @@ namespace IDE.ui
parentListViewItem.mOpenButton?.Open(true, false); parentListViewItem.mOpenButton?.Open(true, false);
String name = new .(16); String name = new .(16);
int32 checkIdx = 1; int32 checkIdx = 0;
repeat repeat
{ {
name..Clear().AppendF($"New Folder {checkIdx}"); name..Clear().AppendF($"New folder");
if (checkIdx > 0)
name.AppendF("{}", checkIdx + 1);
checkIdx++; checkIdx++;
} }
while(!IsWorkspaceFolderNameUnique(name)); while(!IsWorkspaceFolderNameUnique(name));
@ -2407,7 +2404,6 @@ namespace IDE.ui
} }
public Project ImportProject(String filePath, VerSpec verSpec = .None) public Project ImportProject(String filePath, VerSpec verSpec = .None)
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
@ -2603,7 +2599,7 @@ namespace IDE.ui
anItem = menu.AddItem("Rename"); anItem = menu.AddItem("Rename");
anItem.mOnMenuItemSelected.Add(new (item) => { EditListViewItem(focusedItem); }); anItem.mOnMenuItemSelected.Add(new (item) => { EditListViewItem(focusedItem); });
menu.AddItem(); menu.AddItem();
anItem = menu.AddItem("Add Workspace Folder"); anItem = menu.AddItem("New Folder");
anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder(folder.mListView); }); anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder(folder.mListView); });
handled = true; handled = true;
} }
@ -2621,8 +2617,7 @@ namespace IDE.ui
anItem = menu.AddItem("Add From Installed..."); anItem = menu.AddItem("Add From Installed...");
anItem.mOnMenuItemSelected.Add(new (item) => { mImportInstalledDeferred = true; }); anItem.mOnMenuItemSelected.Add(new (item) => { mImportInstalledDeferred = true; });
menu.AddItem(); anItem = menu.AddItem("New Folder");
anItem = menu.AddItem("Add Workspace Folder");
anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder((ProjectListViewItem)mListView.GetRoot()); }); anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder((ProjectListViewItem)mListView.GetRoot()); });
menu.AddItem(); menu.AddItem();
anItem = menu.AddItem("Properties..."); anItem = menu.AddItem("Properties...");