ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 04:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix GameFontHandle.Text position not counting in scrolls, and add support for font gamma changing

Browse source
This commit is contained in:
Soreepeong 2022-03-03 11:36:32 +09:00
parent 940fbb0a2f
commit b72bfa9d19
6 changed files with 108 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Dalamud/Interface/GameFonts/GameFontHandle.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Numerics;
using ImGuiNET;
namespace Dalamud.Interface.GameFonts
@ -31,7 +32,16 @@ namespace Dalamud.Interface.GameFonts
/// <summary>
/// Gets a value indicating whether this font is ready for use.
/// </summary>
public bool Available => this.manager.GetFont(this.fontStyle) != null;
public bool Available
{
get
{
unsafe
{
return this.manager.GetFont(this.fontStyle).GetValueOrDefault(null).NativePtr != null;
}
}
}
/// <summary>
/// Gets the font.
@ -68,9 +78,13 @@ namespace Dalamud.Interface.GameFonts
}
else
{
this.LayoutBuilder(text)
.Build()
.Draw(ImGui.GetWindowDrawList(), ImGui.GetWindowPos() + ImGui.GetCursorPos(), ImGui.GetColorU32(ImGuiCol.Text));
var pos = ImGui.GetWindowPos() + ImGui.GetCursorPos();
pos.X -= ImGui.GetScrollX();
pos.Y -= ImGui.GetScrollY();
var layout = this.LayoutBuilder(text).Build();
layout.Draw(ImGui.GetWindowDrawList(), pos, ImGui.GetColorU32(ImGuiCol.Text));
ImGui.Dummy(new Vector2(layout.Width, layout.Height));
}
}