From 382149d86e08dca2ce126113b94b998b5e1fd5a0 Mon Sep 17 00:00:00 2001 From: Frakits Date: Mon, 22 Jul 2024 23:23:31 +0300 Subject: [PATCH] Skibidy --- source/funkin/editors/character/CharacterAnimButton.hx | 6 +++--- source/funkin/editors/character/CharacterEditor.hx | 4 ++-- .../funkin/editors/character/CharacterPropertiesWindow.hx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/funkin/editors/character/CharacterAnimButton.hx b/source/funkin/editors/character/CharacterAnimButton.hx index 4f78181d..6a73ddf8 100644 --- a/source/funkin/editors/character/CharacterAnimButton.hx +++ b/source/funkin/editors/character/CharacterAnimButton.hx @@ -75,7 +75,7 @@ class CharacterAnimButton extends UIButton { foldableButtons.push(nameTextBox); addLabelOn(nameTextBox, "Name", 12); - animTextBox = new UITextBox(nameTextBox.x + 100 + 12, nameTextBox.y, animData.anim, 146, 22, false, true); + animTextBox = new UITextBox(nameTextBox.x + 100, nameTextBox.y, animData.anim, 156, 22, false, true); animTextBox.onChange = (newAnim:String) -> {this.changeAnim(newAnim);}; members.push(animTextBox); foldableButtons.push(animTextBox); @@ -186,13 +186,13 @@ class CharacterAnimButton extends UIButton { animationDisplayBG.follow(this, 16, 61); nameTextBox.follow(this, 158, 72); - animTextBox.follow(this, 290, 72); + animTextBox.follow(this, 282, 72); positionXStepper.follow(this, 158, 118); positionYStepper.follow(this, 218, 118); XYComma.follow(positionXStepper, 64-24, 6); - fpsStepper.follow(this, 290, 118); + fpsStepper.follow(this, 282, 118); loopedCheckbox.follow(this, 336, 122); indicesTextBox.follow(this, 158, 164); diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index 0a3974e9..40516708 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -264,7 +264,7 @@ class CharacterEditor extends UIState { uiGroup.cameras = [uiCamera]; add(cameraHoverDummy = new CameraHoverDummy(uiGroup, FlxPoint.weak(0, 0))); - characterPropertiesWindow = new CharacterPropertiesWindow((FlxG.width-(456)), 23+12+10, character); + characterPropertiesWindow = new CharacterPropertiesWindow((FlxG.width-(432)), 23+12+10, character); uiGroup.add(characterPropertiesWindow); topMenuSpr = new UITopMenu(topMenu); @@ -279,7 +279,7 @@ class CharacterEditor extends UIState { animationText = new UIText(0, 0, 0, ""); uiGroup.add(animationText); - characterAnimsWindow = new CharacterAnimsWindow(characterPropertiesWindow.x - 44, characterPropertiesWindow.y+224+16, character); + characterAnimsWindow = new CharacterAnimsWindow(characterPropertiesWindow.x - 60, characterPropertiesWindow.y+224+16, character); uiGroup.add(characterAnimsWindow); add(uiGroup); diff --git a/source/funkin/editors/character/CharacterPropertiesWindow.hx b/source/funkin/editors/character/CharacterPropertiesWindow.hx index 0599e55a..fe0e41ca 100644 --- a/source/funkin/editors/character/CharacterPropertiesWindow.hx +++ b/source/funkin/editors/character/CharacterPropertiesWindow.hx @@ -17,7 +17,7 @@ class CharacterPropertiesWindow extends UISliceSprite { public var designedAsDropDown:UIDropDown; public function new(x:Float, y:Float, character:Character) @:privateAccess { - super(x, y, 440, 204+20, "editors/ui/inputbox"); + super(x, y, 424, 204+20, "editors/ui/inputbox"); function addLabelOn(ui:UISprite, text:String) members.push(new UIText(ui.x, ui.y - 24, 0, text)); @@ -39,7 +39,7 @@ class CharacterPropertiesWindow extends UISliceSprite { }; members.push(positionYStepper); - scaleStepper = new UINumericStepper(positionYStepper.x+104+32, positionYStepper.y, character.scale.x, 0.001, 2, 0, null, 104); + scaleStepper = new UINumericStepper(positionYStepper.x+104+16, positionYStepper.y, character.scale.x, 0.001, 2, 0, null, 104); scaleStepper.onChange = (text:String) -> { @:privateAccess scaleStepper.__onChange(text); this.changeScale(scaleStepper.value);