diff --git a/Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs b/Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs index 65b39962b..f57548258 100644 --- a/Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs +++ b/Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs @@ -54,7 +54,8 @@ public class ModelPrefabEditor : GenericEditor } // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, modelPrefab.ImportPath, false); + var group = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(group, modelPrefab.ImportPath, false); var button = layout.Button("Reimport", "Reimports the source asset as prefab."); _reimportButton = button.Button; diff --git a/Source/Editor/Utilities/Utils.cs b/Source/Editor/Utilities/Utils.cs index b4666b213..7c7d3d2d2 100644 --- a/Source/Editor/Utilities/Utils.cs +++ b/Source/Editor/Utilities/Utils.cs @@ -402,7 +402,7 @@ namespace FlaxEditor.Utilities /// /// Creates an Import path ui that show the asset import path and adds a button to show the folder in the file system. /// - /// The parent layout container. + /// The parent layout element. /// The asset item to get the import path of. public static void CreateImportPathUI(CustomEditors.LayoutElementsContainer parentLayout, Content.BinaryAssetItem assetItem) { @@ -413,7 +413,7 @@ namespace FlaxEditor.Utilities /// /// Creates an Import path ui that show the import path and adds a button to show the folder in the file system. /// - /// The parent layout container. + /// The parent layout element. /// The import path. /// Whether to use an initial layout space of 5 for separation. public static void CreateImportPathUI(CustomEditors.LayoutElementsContainer parentLayout, string path, bool useInitialSpacing = true) @@ -421,13 +421,11 @@ namespace FlaxEditor.Utilities if (!string.IsNullOrEmpty(path)) { if (useInitialSpacing) - parentLayout.Space(5); - parentLayout.Label("Import Path:").Label.TooltipText = "Source asset path (can be relative or absolute to the project)"; + parentLayout.Space(0); var textBox = parentLayout.TextBox().TextBox; - textBox.TooltipText = "Path is not editable here."; + textBox.TooltipText = "Source asset path. Can be relative or absolute to the project. Path is not editable here."; textBox.IsReadOnly = true; textBox.Text = path; - parentLayout.Space(2); var button = parentLayout.Button(Constants.ShowInExplorer).Button; button.Clicked += () => FileSystem.ShowFileExplorer(Path.GetDirectoryName(path)); } diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs index 1235bf62d..41fdfde65 100644 --- a/Source/Editor/Windows/Assets/AnimationWindow.cs +++ b/Source/Editor/Windows/Assets/AnimationWindow.cs @@ -231,7 +231,8 @@ namespace FlaxEditor.Windows.Assets group.Object(importSettingsValues); // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, proxy.Window.Item as BinaryAssetItem); + group = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(group, proxy.Window.Item as BinaryAssetItem); layout.Space(5); var reimportButton = layout.Button("Reimport"); diff --git a/Source/Editor/Windows/Assets/AudioClipWindow.cs b/Source/Editor/Windows/Assets/AudioClipWindow.cs index 1c15ee96f..250a7eb77 100644 --- a/Source/Editor/Windows/Assets/AudioClipWindow.cs +++ b/Source/Editor/Windows/Assets/AudioClipWindow.cs @@ -6,6 +6,7 @@ using FlaxEditor.Content.Import; using FlaxEditor.CustomEditors; using FlaxEditor.CustomEditors.Editors; using FlaxEditor.GUI; +using FlaxEditor.Scripting; using FlaxEditor.Viewport.Previews; using FlaxEngine; using FlaxEngine.GUI; @@ -76,7 +77,8 @@ namespace FlaxEditor.Windows.Assets { public override void Initialize(LayoutElementsContainer layout) { - var window = ((PropertiesProxy)Values[0])._window; + var proxy = ((PropertiesProxy)Values[0]); + var window = proxy._window; if (window == null) { layout.Label("Loading...", TextAlignment.Center); @@ -101,7 +103,8 @@ namespace FlaxEditor.Windows.Assets base.Initialize(layout); // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, window.Item as BinaryAssetItem); + var pathGroup = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(pathGroup, window.Item as BinaryAssetItem); layout.Space(5); var reimportButton = layout.Button("Reimport"); diff --git a/Source/Editor/Windows/Assets/CubeTextureWindow.cs b/Source/Editor/Windows/Assets/CubeTextureWindow.cs index c27061630..c4d7ab053 100644 --- a/Source/Editor/Windows/Assets/CubeTextureWindow.cs +++ b/Source/Editor/Windows/Assets/CubeTextureWindow.cs @@ -55,10 +55,11 @@ namespace FlaxEditor.Windows.Assets base.Initialize(layout); // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, window.Item as BinaryAssetItem); + var pathGroup = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(pathGroup, window.Item as BinaryAssetItem); - layout.Space(5); - var reimportButton = layout.Button("Reimport"); + pathGroup.Space(5); + var reimportButton = pathGroup.Button("Reimport"); reimportButton.Button.Clicked += () => ((PropertiesProxy)Values[0]).Reimport(); } } diff --git a/Source/Editor/Windows/Assets/ModelBaseWindow.cs b/Source/Editor/Windows/Assets/ModelBaseWindow.cs index 3431dfd7f..216dede67 100644 --- a/Source/Editor/Windows/Assets/ModelBaseWindow.cs +++ b/Source/Editor/Windows/Assets/ModelBaseWindow.cs @@ -754,17 +754,18 @@ namespace FlaxEditor.Windows.Assets if (Utilities.Utils.OnAssetProperties(layout, proxy.Asset)) return; - var group = layout.Group("Import Settings"); + var importSettingsGroup = layout.Group("Import Settings"); var importSettingsField = typeof(ImportPropertiesProxyBase).GetField(nameof(ImportSettings), BindingFlags.NonPublic | BindingFlags.Instance); var importSettingsValues = new ValueContainer(new ScriptMemberInfo(importSettingsField)) { proxy.ImportSettings }; - group.Object(importSettingsValues); + importSettingsGroup.Object(importSettingsValues); + importSettingsGroup.Space(3); // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, proxy.Window.Item as BinaryAssetItem); + var group = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(group, proxy.Window.Item as BinaryAssetItem); - layout.Space(5); - var reimportButton = group.Button("Reimport"); + var reimportButton = importSettingsGroup.Button("Reimport"); reimportButton.Button.Clicked += () => ((ImportPropertiesProxyBase)Values[0]).Reimport(); } } diff --git a/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs b/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs index 44016e57a..94deb18c0 100644 --- a/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs +++ b/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs @@ -119,9 +119,10 @@ namespace FlaxEditor.Windows.Assets } base.Initialize(layout); - + // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, proxy._window.Item as BinaryAssetItem); + var group = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(group, proxy._window.Item as BinaryAssetItem); layout.Space(5); var reimportButton = layout.Button("Reimport"); diff --git a/Source/Editor/Windows/Assets/TextureWindow.cs b/Source/Editor/Windows/Assets/TextureWindow.cs index 06c6120ad..865099aea 100644 --- a/Source/Editor/Windows/Assets/TextureWindow.cs +++ b/Source/Editor/Windows/Assets/TextureWindow.cs @@ -143,7 +143,8 @@ namespace FlaxEditor.Windows.Assets base.Initialize(layout); // Creates the import path UI - Utilities.Utils.CreateImportPathUI(layout, proxy._window.Item as BinaryAssetItem); + var group = layout.Group("Import Path"); + Utilities.Utils.CreateImportPathUI(group, proxy._window.Item as BinaryAssetItem); // Reimport layout.Space(5);