From 002ab366fec03b8b7c121db534509761cf61872d Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Tue, 6 Aug 2024 12:56:08 -0500 Subject: [PATCH 1/2] Only sort surface parameters alphabetically if script member order is set to Alphabetical. --- Source/Editor/Surface/SurfaceUtils.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Editor/Surface/SurfaceUtils.cs b/Source/Editor/Surface/SurfaceUtils.cs index ad77aa510..4767cf820 100644 --- a/Source/Editor/Surface/SurfaceUtils.cs +++ b/Source/Editor/Surface/SurfaceUtils.cs @@ -8,6 +8,7 @@ using System.Reflection; using System.Text; using FlaxEditor.CustomEditors; using FlaxEditor.CustomEditors.Elements; +using FlaxEditor.Options; using FlaxEditor.Scripting; using FlaxEditor.Utilities; using FlaxEngine.Utilities; @@ -247,7 +248,9 @@ namespace FlaxEditor.Surface data[i] = new GraphParameterData(null, parameter.Name, parameter.IsPublic, ToType(parameter.ParameterType), attributes, parameter); i++; } - Array.Sort(data, GraphParameterData.Compare); + if (Editor.Instance.Options.Options.General.ScriptMembersOrder == GeneralOptions.MembersOrder.Alphabetical) + Array.Sort(data, GraphParameterData.Compare); + return data; } From 36eec5bf95757009d94d9685dc91c8ca632318f6 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Tue, 6 Aug 2024 13:01:28 -0500 Subject: [PATCH 2/2] Better fix --- Source/Editor/Surface/SurfaceUtils.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Editor/Surface/SurfaceUtils.cs b/Source/Editor/Surface/SurfaceUtils.cs index 4767cf820..86acf7b26 100644 --- a/Source/Editor/Surface/SurfaceUtils.cs +++ b/Source/Editor/Surface/SurfaceUtils.cs @@ -72,7 +72,12 @@ namespace FlaxEditor.Surface } // By name - return string.Compare(x.DisplayName, y.DisplayName, StringComparison.InvariantCulture); + if (Editor.Instance.Options.Options.General.ScriptMembersOrder == GeneralOptions.MembersOrder.Alphabetical) + { + return string.Compare(x.DisplayName, y.DisplayName, StringComparison.InvariantCulture); + } + // Keep same order + return 0; } } @@ -248,9 +253,7 @@ namespace FlaxEditor.Surface data[i] = new GraphParameterData(null, parameter.Name, parameter.IsPublic, ToType(parameter.ParameterType), attributes, parameter); i++; } - if (Editor.Instance.Options.Options.General.ScriptMembersOrder == GeneralOptions.MembersOrder.Alphabetical) - Array.Sort(data, GraphParameterData.Compare); - + Array.Sort(data, GraphParameterData.Compare); return data; }