diff --git a/Dalamud/Interface/GameFonts/GameFontManager.cs b/Dalamud/Interface/GameFonts/GameFontManager.cs index a9bdd73f8..ae44f4278 100644 --- a/Dalamud/Interface/GameFonts/GameFontManager.cs +++ b/Dalamud/Interface/GameFonts/GameFontManager.cs @@ -279,7 +279,7 @@ namespace Dalamud.Interface.GameFonts { var interfaceManager = Service.Get(); var ioFonts = ImGui.GetIO().Fonts; - ioFonts.GetTexDataAsRGBA32(out byte* pixels8, out var width, out var height); + ioFonts.GetTexDataAsRGBA32(0, out byte* pixels8, out var width, out var height); var pixels32 = (uint*)pixels8; var fontGamma = interfaceManager.FontGamma; diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs index 9c54c46ef..f56963960 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs @@ -462,13 +462,13 @@ namespace Dalamud.Interface.ImGuiFileDialog if (this.pathInputActivated) { - if (ImGui.IsKeyReleased(ImGui.GetKeyIndex(ImGuiKey.Enter))) + if (ImGui.IsKeyReleased(ImGuiKey.Enter)) { if (Directory.Exists(this.pathInputBuffer)) this.SetPath(this.pathInputBuffer); this.pathInputActivated = false; } - if (ImGui.IsKeyReleased(ImGui.GetKeyIndex(ImGuiKey.Escape))) + if (ImGui.IsKeyReleased(ImGuiKey.Escape)) { this.pathInputActivated = false; } diff --git a/Dalamud/Interface/ImGuiHelpers.cs b/Dalamud/Interface/ImGuiHelpers.cs index c873210c1..d949a06ea 100644 --- a/Dalamud/Interface/ImGuiHelpers.cs +++ b/Dalamud/Interface/ImGuiHelpers.cs @@ -171,6 +171,7 @@ namespace Dalamud.Interface target.Value!.AddGlyph( target.Value!.ConfigData, (ushort)glyph->Codepoint, + 0, glyph->X0 * scale, ((glyph->Y0 - source.Value!.Ascent) * scale) + target.Value!.Ascent, glyph->X1 * scale, diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 20bb86e3c..2869005da 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -884,7 +884,7 @@ namespace Dalamud.Interface.Internal if (Math.Abs(fontGamma - 1.0f) >= 0.001) { // Gamma correction (stbtt/FreeType would output in linear space whereas most real world usages will apply 1.4 or 1.8 gamma; Windows/XIV prebaked uses 1.4) - ioFonts.GetTexDataAsRGBA32(out byte* texPixels, out var texWidth, out var texHeight); + ioFonts.GetTexDataAsRGBA32(0, out byte* texPixels, out var texWidth, out var texHeight); for (int i = 3, i_ = texWidth * texHeight * 4; i < i_; i += 4) texPixels[i] = (byte)(Math.Pow(texPixels[i] / 255.0f, 1.0f / fontGamma) * 255.0f); } diff --git a/lib/ImGuiScene b/lib/ImGuiScene index 5da5fb742..d48cf7ffb 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit 5da5fb742375aba55026f3beeef05dfe876a21bd +Subproject commit d48cf7ffbbb7c545a02e8dee7705d4f302217d81