ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-29 11:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Re-add ImGui.NET, add compatibility shims

Browse source
This commit is contained in:
goaaats 2025-04-13 21:52:27 +02:00
parent b2fd7cc9e1
commit 308b9e4575
15 changed files with 173 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -720,7 +720,7 @@ internal partial class InterfaceManager : IInternalDisposableService
// NOTE (Chiv) Explicitly deactivate on dalamud boot
ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
ImGuiHelpers.MainViewport = ImGui.GetMainViewport();
ImGuiHelpers.MainViewportNew = ImGui.GetMainViewport();
Log.Information("[IM] Scene & ImGui setup OK!");
}

2
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -672,6 +672,6 @@ internal unsafe class UiDebug
position += ImGuiHelpers.MainViewport.Pos;
ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewport).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewportNew).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
}
}

2
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -3885,7 +3885,7 @@ internal class PluginInstallerWindow : Window, IDisposable
{
var positionOffset = ImGuiHelpers.ScaledVector2(0.0f, 1.0f);
var cursorStart = ImGui.GetCursorPos() + positionOffset;
ImGui.PushFont(UiBuilder.IconFont);
ImGui.PushFont(InterfaceManager.IconFont);
ImGui.PushStyleColor(ImGuiCol.Text, outline);
foreach (var x in Enumerable.Range(-1, 3))

2
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs
View file

@ -56,7 +56,7 @@ public class SettingsTabDtr : SettingsTab
// TODO: Maybe we can also resort the rest of the bar in the future?
// var isRequired = search is Configuration.SearchSetting.Internal or Configuration.SearchSetting.MacroLinks;
ImGui.PushFont(UiBuilder.IconFont);
ImGui.PushFont(UiBuilder.IconFontNew);
var arrowUpText = $"{FontAwesomeIcon.ArrowUp.ToIconString()}##{title}";
if (i == 0)