Skip to content

add font initialize callback #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psydack merged 1 commit into from
Dec 25, 2021
Merged

add font initialize callback #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Editor/Editors/UImGuiEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ internal class UImGuiEditor : UnityEditor.Editor
private SerializedProperty _platform;
private SerializedProperty _initialConfiguration;
private SerializedProperty _fontAtlasConfiguration;
private SerializedProperty _fontCustomInitializer;
private SerializedProperty _iniSettings;
private SerializedProperty _shaders;
private SerializedProperty _style;
Expand Down Expand Up @@ -46,6 +47,7 @@ public override void OnInspectorGUI()
EditorGUILayout.PropertyField(_platform);
EditorGUILayout.PropertyField(_initialConfiguration);
EditorGUILayout.PropertyField(_fontAtlasConfiguration);
EditorGUILayout.PropertyField(_fontCustomInitializer);
EditorGUILayout.PropertyField(_iniSettings);
EditorGUILayout.PropertyField(_shaders);
EditorGUILayout.PropertyField(_style);
Expand Down Expand Up @@ -75,6 +77,7 @@ private void OnEnable()
_platform = serializedObject.FindProperty("_platformType");
_initialConfiguration = serializedObject.FindProperty("_initialConfiguration");
_fontAtlasConfiguration = serializedObject.FindProperty("_fontAtlasConfiguration");
_fontCustomInitializer = serializedObject.FindProperty("_fontCustomInitializer");
_iniSettings = serializedObject.FindProperty("_iniSettings");
_shaders = serializedObject.FindProperty("_shaders");
_style = serializedObject.FindProperty("_style");
Expand Down
13 changes: 10 additions & 3 deletions Source/Texture/TextureManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private IntPtr RegisterTexture(UTexture texture)
return id;
}

public void BuildFontAtlas(ImGuiIOPtr io, in FontAtlasConfigAsset settings)
public void BuildFontAtlas(ImGuiIOPtr io, in FontAtlasConfigAsset settings, UnityEngine.Events.UnityEvent custom)
{
if (io.Fonts.IsBuilt())
{
Expand All @@ -115,8 +115,15 @@ public void BuildFontAtlas(ImGuiIOPtr io, in FontAtlasConfigAsset settings)

if (settings == null)
{
io.Fonts.AddFontDefault();
io.Fonts.Build();
if (custom.GetPersistentEventCount() > 0)
{
custom.Invoke();
}
else
{
io.Fonts.AddFontDefault();
io.Fonts.Build();
}
return;
}

Expand Down
5 changes: 4 additions & 1 deletion Source/UImGui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ public class UImGui : MonoBehaviour
ConfigMemoryCompactTimer = 1f,
};

[SerializeField]
private UnityEngine.Events.UnityEvent _fontCustomInitializer;

[SerializeField]
private FontAtlasConfigAsset _fontAtlasConfiguration = null;

Expand Down Expand Up @@ -160,7 +163,7 @@ void Fail(string reason)
_initialConfiguration.ApplyTo(io);
_style?.ApplyTo(ImGui.GetStyle());

_context.TextureManager.BuildFontAtlas(io, _fontAtlasConfiguration);
_context.TextureManager.BuildFontAtlas(io, _fontAtlasConfiguration, _fontCustomInitializer);
_context.TextureManager.Initialize(io);

IPlatform platform = PlatformUtility.Create(_platformType, _cursorShapes, _iniSettings);
Expand Down