GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'import-ui-spacing' of https://github.com/Tryibion/FlaxEngine into Tryibion-import-ui-spacing

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-12 21:59:28 +01:00
parent 281e13b42c e87bb2325b
commit b546e4a332
7 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs
View File

@@ -53,6 +53,9 @@ public class ModelPrefabEditor : GenericEditor
}
}
// Creates the import path UI
Utilities.Utils.CreateImportPathUI(layout, modelPrefab.ImportPath, false);
var button = layout.Button("Reimport", "Reimports the source asset as prefab.");
_reimportButton = button.Button;
_reimportButton.Clicked += OnReimport;

16
Source/Editor/Utilities/Utils.cs
View File

@@ -391,10 +391,22 @@ namespace FlaxEditor.Utilities
public static void CreateImportPathUI(CustomEditors.LayoutElementsContainer parentLayout, Content.BinaryAssetItem assetItem)
{
assetItem.GetImportPath(out var path);
CreateImportPathUI(parentLayout, path);
}
/// <summary>
/// Creates an Import path ui that show the import path and adds a button to show the folder in the file system.
/// </summary>
/// <param name="parentLayout">The parent layout container.</param>
/// <param name="path">The import path.</param>
/// <param name="useInitialSpacing">Whether to use an initial layout space of 5 for separation.</param>
public static void CreateImportPathUI(CustomEditors.LayoutElementsContainer parentLayout, string path, bool useInitialSpacing = true)
{
if (!string.IsNullOrEmpty(path))
{
parentLayout.Space(5);
parentLayout.Label("Import Path:");
if (useInitialSpacing)
parentLayout.Space(5);
parentLayout.Label("Import Path:").Label.TooltipText = "Source asset path (can be relative or absolute to the project)";
var textBox = parentLayout.TextBox().TextBox;
textBox.TooltipText = "Path is not editable here.";
textBox.IsReadOnly = true;

2
Source/Editor/Windows/Assets/AudioClipWindow.cs
View File

@@ -104,7 +104,7 @@ namespace FlaxEditor.Windows.Assets
// Creates the import path UI
Utilities.Utils.CreateImportPathUI(layout, window.Item as BinaryAssetItem);
layout.Space(10);
layout.Space(5);
var reimportButton = layout.Button("Reimport");
reimportButton.Button.Clicked += () => ((PropertiesProxy)Values[0]).Reimport();
}

2
Source/Editor/Windows/Assets/CubeTextureWindow.cs
View File

@@ -57,7 +57,7 @@ namespace FlaxEditor.Windows.Assets
// Creates the import path UI
Utilities.Utils.CreateImportPathUI(layout, window.Item as BinaryAssetItem);
layout.Space(10);
layout.Space(5);
var reimportButton = layout.Button("Reimport");
reimportButton.Button.Clicked += () => ((PropertiesProxy)Values[0]).Reimport();
}

2
Source/Editor/Windows/Assets/SpriteAtlasWindow.cs
View File

@@ -123,7 +123,7 @@ namespace FlaxEditor.Windows.Assets
// Creates the import path UI
Utilities.Utils.CreateImportPathUI(layout, proxy._window.Item as BinaryAssetItem);
layout.Space(10);
layout.Space(5);
var reimportButton = layout.Button("Reimport");
reimportButton.Button.Clicked += () => ((PropertiesProxy)Values[0]).Reimport();
}

2
Source/Editor/Windows/Assets/TextureWindow.cs
View File

@@ -149,7 +149,7 @@ namespace FlaxEditor.Windows.Assets
Utilities.Utils.CreateImportPathUI(layout, proxy._window.Item as BinaryAssetItem);
// Reimport
layout.Space(10);
layout.Space(5);
var reimportButton = layout.Button("Reimport");
reimportButton.Button.Clicked += () => ((ImportPropertiesProxy)Values[0]).Reimport();
}

2
Source/Engine/Level/Scripts/ModelPrefab.h
View File

@@ -19,7 +19,7 @@ API_CLASS(Attributes="HideInEditor") class FLAXENGINE_API ModelPrefab : public S
/// <summary>
/// Source model file path (absolute or relative to the project).
/// </summary>
API_FIELD(Attributes="ReadOnly") String ImportPath;
API_FIELD(Attributes="ReadOnly, HideInEditor") String ImportPath;
/// <summary>
/// Model file import settings.