Core - Refactor stuff

This commit is contained in:
miku-666
2026-01-16 15:30:38 +01:00
parent 3425c00502
commit 386feb4694
3 changed files with 14 additions and 2 deletions

View File

@@ -63,7 +63,9 @@ namespace PckStudio.Forms.Additional_Popups.Animation
};
TreeView view = filterPrompt.AddFilterPage(name, null, filterPredicate);
view.ImageList = images.ToImageList();
foreach ((int i, JsonTileInfo tileData) in textureInfos?.Enumerate())
int i = 0;
foreach (JsonTileInfo tileData in textureInfos)
{
if (string.IsNullOrEmpty(tileData.InternalName) || view.Nodes.ContainsKey(tileData.InternalName))
continue;
@@ -73,6 +75,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation
Tag = tileData
};
view.Nodes.Add(tileNode);
i++;
}
}

View File

@@ -91,6 +91,14 @@ namespace PckStudio.Forms.Additional_Popups.Animation
_selectedItem = e.Node.Tag;
Events[nameof(OnSelectedItemChanged)]?.DynamicInvoke(this, EventArgs.Empty);
};
pageView.KeyPress += (s, e) =>
{
if ((e.KeyChar == '\n' || e.KeyChar == '\r') && Parent is Form f)
{
f.DialogResult = DialogResult.OK;
e.Handled = true;
}
};
var backingView = new TreeView()
{
Dock = DockStyle.Fill,

View File

@@ -35,6 +35,7 @@ using PckStudio.Core.Serializer;
using PckStudio.Core;
using PckStudio.Interfaces;
using PckStudio.Controls;
using PckStudio.Core.IO.Java;
namespace PckStudio.Forms.Editor
{
@@ -328,7 +329,7 @@ namespace PckStudio.Forms.Editor
try
{
Image img = Image.FromFile(textureFile).ReleaseFromFile();
JObject mcmeta = JObject.Parse(File.ReadAllText(fileDialog.FileName));
McMeta mcmeta = McMeta.LoadMcMeta(File.ReadAllText(fileDialog.FileName));
Animation javaAnimation = AnimationDeserializer.DefaultDeserializer.DeserializeJavaAnimation(mcmeta, img);
EditorValue = javaAnimation;
LoadAnimationTreeView();