From e31ce787aa3d8bf43a45659c159c2a71addd80c0 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 17 Apr 2024 23:04:09 +0200 Subject: [PATCH] Add improved size of Multi Blend nodes #1980 --- .../Archetypes/Animation.MultiBlend.cs | 5 ++-- Source/Editor/Surface/Archetypes/Animation.cs | 26 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs index 1178f54de..1b7ec5fc1 100644 --- a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs +++ b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs @@ -795,11 +795,12 @@ namespace FlaxEditor.Surface.Archetypes }; _animationY.ValueChanged += OnAnimationYChanged; + var size = Width - FlaxEditor.Surface.Constants.NodeMarginX * 2.0f; _editor = new Editor(this, FlaxEditor.Surface.Constants.NodeMarginX, _animationY.Bottom + 4.0f, - Width - FlaxEditor.Surface.Constants.NodeMarginX * 2.0f, - 120.0f); + size, + size); _editor.Parent = this; } diff --git a/Source/Editor/Surface/Archetypes/Animation.cs b/Source/Editor/Surface/Archetypes/Animation.cs index 98f238391..f00bd670b 100644 --- a/Source/Editor/Surface/Archetypes/Animation.cs +++ b/Source/Editor/Surface/Archetypes/Animation.cs @@ -658,10 +658,10 @@ namespace FlaxEditor.Surface.Archetypes NodeElementArchetype.Factory.Input(2, "Start Position", true, typeof(float), 3, 3), // Axis X - NodeElementArchetype.Factory.Input(4, "X", true, typeof(float), 4), - NodeElementArchetype.Factory.Text(30, 4 * Surface.Constants.LayoutOffsetY, "(min: max: )"), - NodeElementArchetype.Factory.Float(60, 4 * Surface.Constants.LayoutOffsetY, 0, 0), - NodeElementArchetype.Factory.Float(145, 4 * Surface.Constants.LayoutOffsetY, 0, 1), + NodeElementArchetype.Factory.Input(3, "X", true, typeof(float), 4), + NodeElementArchetype.Factory.Text(30, 3 * Surface.Constants.LayoutOffsetY + 2, "(min: max: )"), + NodeElementArchetype.Factory.Float(60, 3 * Surface.Constants.LayoutOffsetY + 2, 0, 0), + NodeElementArchetype.Factory.Float(145, 3 * Surface.Constants.LayoutOffsetY + 2, 0, 1), } }, new NodeArchetype @@ -671,7 +671,7 @@ namespace FlaxEditor.Surface.Archetypes Title = "Multi Blend 2D", Description = "Animation blending in 2D", Flags = NodeFlags.AnimGraph, - Size = new Float2(420, 320), + Size = new Float2(420, 620), DefaultValues = new object[] { // Node data @@ -707,16 +707,16 @@ namespace FlaxEditor.Surface.Archetypes NodeElementArchetype.Factory.Input(2, "Start Position", true, typeof(float), 3, 3), // Axis X - NodeElementArchetype.Factory.Input(4, "X", true, typeof(float), 4), - NodeElementArchetype.Factory.Text(30, 4 * Surface.Constants.LayoutOffsetY, "(min: max: )"), - NodeElementArchetype.Factory.Float(60, 4 * Surface.Constants.LayoutOffsetY, 0, 0), - NodeElementArchetype.Factory.Float(145, 4 * Surface.Constants.LayoutOffsetY, 0, 1), + NodeElementArchetype.Factory.Input(3, "X", true, typeof(float), 4), + NodeElementArchetype.Factory.Text(30, 3 * Surface.Constants.LayoutOffsetY + 2, "(min: max: )"), + NodeElementArchetype.Factory.Float(60, 3 * Surface.Constants.LayoutOffsetY + 2, 0, 0), + NodeElementArchetype.Factory.Float(145, 3 * Surface.Constants.LayoutOffsetY + 2, 0, 1), // Axis Y - NodeElementArchetype.Factory.Input(5, "Y", true, typeof(float), 5), - NodeElementArchetype.Factory.Text(30, 5 * Surface.Constants.LayoutOffsetY, "(min: max: )"), - NodeElementArchetype.Factory.Float(60, 5 * Surface.Constants.LayoutOffsetY, 0, 2), - NodeElementArchetype.Factory.Float(145, 5 * Surface.Constants.LayoutOffsetY, 0, 3), + NodeElementArchetype.Factory.Input(4, "Y", true, typeof(float), 5), + NodeElementArchetype.Factory.Text(30, 4 * Surface.Constants.LayoutOffsetY + 2, "(min: max: )"), + NodeElementArchetype.Factory.Float(60, 4 * Surface.Constants.LayoutOffsetY + 2, 0, 2), + NodeElementArchetype.Factory.Float(145, 4 * Surface.Constants.LayoutOffsetY + 2, 0, 3), } }, new NodeArchetype