ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1617 from Soreepeong/fix/ifontatlas-defaultfont

Browse source 
Set ImGui default font upon default font atlas update
This commit is contained in:
goat 2024-01-20 10:16:29 +01:00 • committed by GitHub
commit 11c1b4658b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -717,6 +717,12 @@ internal class InterfaceManager : IDisposable, IServiceType
// Fill missing glyphs in MonoFont from DefaultFont // Fill missing glyphs in MonoFont from DefaultFont
tk.CopyGlyphsAcrossFonts(this.defaultFontHandle.ImFont, this.monoFontHandle.ImFont, true); tk.CopyGlyphsAcrossFonts(this.defaultFontHandle.ImFont, this.monoFontHandle.ImFont, true);
// Update default font
unsafe
{
ImGui.GetIO().NativePtr->FontDefault = this.defaultFontHandle.ImFont;
}
// Broadcast to auto-rebuilding instances // Broadcast to auto-rebuilding instances
this.AfterBuildFonts?.Invoke(); this.AfterBuildFonts?.Invoke();
}); });
@ -888,13 +894,10 @@ internal class InterfaceManager : IDisposable, IServiceType
var snap = ImGuiManagedAsserts.GetSnapshot(); var snap = ImGuiManagedAsserts.GetSnapshot();
if (this.IsDispatchingEvents) if (this.IsDispatchingEvents)
{
using (this.defaultFontHandle?.Push())
{ {
this.Draw?.Invoke(); this.Draw?.Invoke();
Service<NotificationManager>.Get().Draw(); Service<NotificationManager>.Get().Draw();
} }
}
ImGuiManagedAsserts.ReportProblems("Dalamud Core", snap); ImGuiManagedAsserts.ReportProblems("Dalamud Core", snap);
} }