From e5880d403acd4ca40d07e8b7051be042b2c47c8b Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:10:37 -0700 Subject: [PATCH] making the anim box slightly bigger fr --- source/funkin/editors/character/CharacterAnimScreen.hx | 4 ++-- source/funkin/editors/character/CharacterEditor.hx | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/funkin/editors/character/CharacterAnimScreen.hx b/source/funkin/editors/character/CharacterAnimScreen.hx index 01bd59e4..cbfa5e9f 100644 --- a/source/funkin/editors/character/CharacterAnimScreen.hx +++ b/source/funkin/editors/character/CharacterAnimScreen.hx @@ -56,11 +56,11 @@ class CharacterAnimScreen extends UISubstateWindow { add(nameTextBox); addLabelOn(nameTextBox, "Name"); - animTextBox = new UITextBox(nameTextBox.x + 160 + 26, nameTextBox.y, animData.anim, 180); + animTextBox = new UITextBox(nameTextBox.x + 160 + 26, nameTextBox.y, animData.anim, 200); add(animTextBox); addLabelOn(animTextBox, "Animation"); - fpsStepper = new UINumericStepper(animTextBox.x + 180 + 26, animTextBox.y, animData.fps, 0.1, 2, 1, 100, 82); + fpsStepper = new UINumericStepper(animTextBox.x + 200 + 26, animTextBox.y, animData.fps, 0.1, 2, 1, 100, 82); add(fpsStepper); addLabelOn(fpsStepper, "FPS"); diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index 8871b532..e02d5c1f 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -382,10 +382,12 @@ class CharacterEditor extends UIState { var oldID:Int = character.animation.getNameList().indexOf(name); var oldAnimData:AnimData = character.animDatas.get(name); - if (character.animation.exists(name)) { + if (character.animation.exists(name)) character.animation.remove(name); + if (character.animOffsets.exists(name)) character.animOffsets.remove(name); - } + if (character.animDatas.exists(name)) + character.animDatas.remove(name); characterAnimsWindow.removeButton(name); if (addtoUndo)