universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve current folder handling in FileSystemEditor

Browse Source
This commit is contained in:
Michael Becker 2021-01-24 23:33:10 -05:00
parent d1b00ff02e
commit d4b2803088
No known key found for this signature in database
GPG Key ID: 98C333A81F18C22C
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
View File

@ -224,7 +224,7 @@ namespace UniversalEditor.Editors.FileSystem
File file = GetCurrentFileSystemContainer().AddFile(d.Title.Replace("<", String.Empty).Replace(">", String.Empty));
EndEdit();
TreeModelRow row = RecursiveAddFile(file, tv.SelectedRows.Count == 1 ? tv.SelectedRows[0] : null);
TreeModelRow row = RecursiveAddFile(file, GetCurrentTreeModelRow());
file.Properties["row"] = row;
EmbeddedFileAccessor efa = new EmbeddedFileAccessor(file);
@ -234,6 +234,11 @@ namespace UniversalEditor.Editors.FileSystem
}
}
private TreeModelRow GetCurrentTreeModelRow()
{
return tv.SelectedRows.Count == 1 ? tv.SelectedRows[0] : null;
}
void D_Saved(object sender, EventArgs e)
{
Document d = (sender as Document);
@ -316,7 +321,16 @@ namespace UniversalEditor.Editors.FileSystem
File f = fsom.AddFile(fileTitle, data);
TreeModelRow row = UIGetTreeModelRowForFileSystemObject(f);
row.SetExtraData<IFileSystemObject>("item", f);
tm.Rows.Add(row);
TreeModelRow rowParent = GetCurrentTreeModelRow();
if (rowParent == null)
{
tm.Rows.Add(row);
}
else
{
rowParent.Rows.Add(row);
}
return f;
}
@ -385,6 +399,10 @@ namespace UniversalEditor.Editors.FileSystem
if (fldr != null)
fsct = fldr;
}
else if (CurrentFolder != null)
{
return CurrentFolder;
}
return fsct;
}