LegacyConsoleArchive/PCK-Studio
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-09-23 09:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed selected nodes after tree building

Browse Source
This commit is contained in:
MayNL
2026-07-02 14:00:08 -04:00
parent fc34203d1c
commit 626af233a1
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PCK-Studio/Controls/Editor/PckEditor.cs
+22 -7
View File
@@ -687,13 +687,12 @@ namespace PckStudio.Controls
node.ImageKey = node.SelectedImageKey = GetNodeIconKey(asset, resetNodes); node.ImageKey = node.SelectedImageKey = GetNodeIconKey(asset, resetNodes);
} }
treeViewMain.Sort();
TreeNode[] selectedNodes = treeViewMain.FindPath(selectedNodeText); TreeNode[] selectedNodes = treeViewMain.FindPath(selectedNodeText);
if (selectedNodes.Length > 0) if (selectedNodes.Length > 0)
{ {
treeViewMain.SelectedNode = selectedNodes[0]; treeViewMain.SelectedNode = selectedNodes[0];
} }
treeViewMain.Sort();
} }
private string GetDefaultSkinNodeIconKey(SkinANIM anim) private string GetDefaultSkinNodeIconKey(SkinANIM anim)
@@ -1184,6 +1183,14 @@ namespace PckStudio.Controls
treeViewMain.Focus(); treeViewMain.Focus();
} }
private void SelectNodeByPath(string selectedNodePath)
{
TreeNode[] selectedNodes = treeViewMain.FindPath(selectedNodePath.Replace('\\', '/'));
if (selectedNodes.Length > 0)
treeViewMain.SelectedNode = selectedNodes[0];
}
private void treeViewMain_DragDrop(object sender, DragEventArgs e) private void treeViewMain_DragDrop(object sender, DragEventArgs e)
{ {
// Retrieve the client coordinates of the drop location. // Retrieve the client coordinates of the drop location.
@@ -1263,20 +1270,21 @@ namespace PckStudio.Controls
// Retrieve the node that was dragged. // Retrieve the node that was dragged.
if (draggedNode.TryGetTagData(out PckAsset draggedAsset) && if (draggedNode.TryGetTagData(out PckAsset draggedAsset) &&
string selectedNodePath = "";
targetNode.FullPath != draggedAsset.Filename) targetNode.FullPath != draggedAsset.Filename)
{ {
Debug.WriteLine(draggedAsset.Filename + " was droped onto " + targetNode.FullPath); Debug.WriteLine(draggedAsset.Filename + " was dropped onto " + targetNode.FullPath);
string newFilePath = Path.Combine(isTargetPckFile string newFilePath = Path.Combine(isTargetPckFile
? Path.GetDirectoryName(targetNode.FullPath) ? Path.GetDirectoryName(targetNode.FullPath)
: targetNode.FullPath, Path.GetFileName(draggedAsset.Filename)); : targetNode.FullPath, Path.GetFileName(draggedAsset.Filename));
Debug.WriteLine("New filepath: " + newFilePath); Debug.WriteLine("New filepath: " + newFilePath);
draggedAsset.Filename = newFilePath; draggedAsset.Filename = newFilePath;
_wasModified = true; selectedNodePath = newFilePath;
BuildMainTreeView();
return;
} }
else else
{ {
selectedNodePath = Path.Combine(targetNode.FullPath, draggedNode.Name);
IEnumerable<PckAsset> pckFiles = GetAllChildNodes(draggedNode.Nodes).Where(t => t.IsTagOfType<PckAsset>()).Select(t => t.Tag as PckAsset); IEnumerable<PckAsset> pckFiles = GetAllChildNodes(draggedNode.Nodes).Where(t => t.IsTagOfType<PckAsset>()).Select(t => t.Tag as PckAsset);
string oldPath = draggedNode.FullPath; string oldPath = draggedNode.FullPath;
string newPath = Path.Combine(isTargetPckFile ? Path.GetDirectoryName(targetNode.FullPath) : targetNode.FullPath, draggedNode.Text).Replace('\\', '/'); string newPath = Path.Combine(isTargetPckFile ? Path.GetDirectoryName(targetNode.FullPath) : targetNode.FullPath, draggedNode.Text).Replace('\\', '/');
@@ -1284,9 +1292,11 @@ namespace PckStudio.Controls
{ {
pckFile.Filename = Path.Combine(newPath, pckFile.Filename.Substring(oldPath.Length + 1)).Replace('\\', '/'); pckFile.Filename = Path.Combine(newPath, pckFile.Filename.Substring(oldPath.Length + 1)).Replace('\\', '/');
} }
}
_wasModified = true; _wasModified = true;
BuildMainTreeView(); BuildMainTreeView();
} SelectNodeByPath(selectedNodePath);
} }
private void ImportFiles(string baseDirectory, IEnumerable<string> files, string prefix) private void ImportFiles(string baseDirectory, IEnumerable<string> files, string prefix)
@@ -1860,6 +1870,8 @@ namespace PckStudio.Controls
if (diag.ShowDialog(this) == DialogResult.OK) if (diag.ShowDialog(this) == DialogResult.OK)
{ {
string newPath = "";
if (isFile) if (isFile)
{ {
if (EditorValue.File.Contains(diag.NewText, asset.Type)) if (EditorValue.File.Contains(diag.NewText, asset.Type))
@@ -1868,6 +1880,7 @@ namespace PckStudio.Controls
return; return;
} }
asset.Filename = diag.NewText; asset.Filename = diag.NewText;
newPath = asset.Filename;
} }
else // folders else // folders
{ {
@@ -1881,9 +1894,11 @@ namespace PckStudio.Controls
folderAsset.Filename = childNode.FullPath; folderAsset.Filename = childNode.FullPath;
} }
} }
newPath = diag.NewText;
} }
_wasModified = true; _wasModified = true;
BuildMainTreeView(); BuildMainTreeView();
SelectNodeByPath(newPath);
} }
} }