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

Remove ImGui.NET entirely

Browse source
This commit is contained in:
goaaats 2025-06-22 22:21:12 +02:00
parent 95ec633cc5
commit 90e426b325
29 changed files with 32 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -493,7 +493,7 @@ internal partial class InterfaceManager : IInternalDisposableService
var value = enabled ? 1u : 0u;
global::Windows.Win32.PInvoke.DwmSetWindowAttribute(
new(this.GameWindowHandle.Value),
new(new IntPtr(this.GameWindowHandle.Value)),
DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE,
&value,
sizeof(uint)).ThrowOnFailure();
@ -723,7 +723,7 @@ internal partial class InterfaceManager : IInternalDisposableService
// NOTE (Chiv) Explicitly deactivate on dalamud boot
ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
ImGuiHelpers.MainViewportNew = ImGui.GetMainViewport();
ImGuiHelpers.MainViewport = 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.MainViewportNew).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewport).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
}
}

4
Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
View file

@ -23,14 +23,14 @@ internal class AddonPopoutWindow : Window, IDisposable
: base(name)
{
this.addonTree = tree;
this.PositionConditionNew = ImGuiCond.Once;
this.PositionCondition = ImGuiCond.Once;
var pos = ImGui.GetMousePos() + new Vector2(50, -50);
var workSize = ImGui.GetMainViewport().WorkSize;
var pos2 = new Vector2(Math.Min(workSize.X - 750, pos.X), Math.Min(workSize.Y - 250, pos.Y));
this.Position = pos2;
this.SizeConditionNew = ImGuiCond.Once;
this.SizeCondition = ImGuiCond.Once;
this.Size = new(700, 200);
this.IsOpen = true;
this.SizeConstraints = new() { MinimumSize = new(100, 100) };

4
Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
View file

@ -35,8 +35,8 @@ internal unsafe class NodePopoutWindow : Window, IDisposable
this.Position = pos2;
this.IsOpen = true;
this.PositionConditionNew = ImGuiCond.Once;
this.SizeConditionNew = ImGuiCond.Once;
this.PositionCondition = ImGuiCond.Once;
this.SizeCondition = ImGuiCond.Once;
this.Size = new(700, 200);
this.SizeConstraints = new() { MinimumSize = new(100, 100) };
}

2
Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
View file

@ -216,7 +216,7 @@ internal sealed class ChangelogWindow : Window, IDisposable
ImGui.SetNextWindowBgAlpha(Math.Clamp(this.windowFade.EasedPoint.X, 0, 0.9f));
this.Size = new Vector2(900, 400);
this.SizeConditionNew = ImGuiCond.Always;
this.SizeCondition = ImGuiCond.Always;
// Center the window on the main viewport
var viewportPos = ImGuiHelpers.MainViewport.Pos;

2
Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
View file

@ -23,7 +23,7 @@ internal sealed class ColorDemoWindow : Window
: base("Dalamud Colors Demo")
{
this.Size = new Vector2(600, 500);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.colors = new List<(string Name, Vector4 Color)>()
{

2
Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
View file

@ -38,7 +38,7 @@ internal sealed class ComponentDemoWindow : Window
: base("Dalamud Components Demo")
{
this.Size = new Vector2(600, 500);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;

2
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -100,7 +100,7 @@ internal class ConsoleWindow : Window, IDisposable
cm.AddAlias("clear", "cls");
this.Size = new Vector2(500, 400);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;

2
Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
View file

@ -78,7 +78,7 @@ internal class DataWindow : Window, IDisposable
: base("Dalamud Data", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
{
this.Size = new Vector2(400, 300);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;
this.orderedModules = this.modules.OrderBy(module => module.DisplayName);

2
Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
View file

@ -24,7 +24,7 @@ internal class GamepadModeNotifierWindow : Window
true)
{
this.Size = Vector2.Zero;
this.SizeConditionNew = ImGuiCond.Always;
this.SizeCondition = ImGuiCond.Always;
this.IsOpen = false;
this.RespectCloseHotkey = false;

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

@ -152,7 +152,7 @@ internal class PluginInstallerWindow : Window, IDisposable
this.imageCache = imageCache;
this.Size = new Vector2(830, 570);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConstraints = new WindowSizeConstraints
{

2
Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
View file

@ -37,7 +37,7 @@ internal class PluginStatWindow : Window
this.RespectCloseHotkey = false;
this.Size = new Vector2(810, 520);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
}
/// <inheritdoc/>

2
Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
View file

@ -73,7 +73,7 @@ internal class SelfTestWindow : Window
: base("Dalamud Self-Test", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
{
this.Size = new Vector2(800, 800);
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;
}

6
Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs
View file

@ -1,9 +1,5 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;

2
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -39,7 +39,7 @@ internal class SettingsWindow : Window
MaximumSize = new Vector2(1780, 940),
};
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeCondition = ImGuiCond.FirstUseEver;
this.tabs =
[

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.IconFontNew);
ImGui.PushFont(UiBuilder.IconFont);
var arrowUpText = $"{FontAwesomeIcon.ArrowUp.ToIconString()}##{title}";
if (i == 0)

2
Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
View file

@ -100,7 +100,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
this.ForceMainWindow = true;
this.Position = new Vector2(0, 200);
this.PositionConditionNew = ImGuiCond.Always;
this.PositionCondition = ImGuiCond.Always;
this.RespectCloseHotkey = false;
this.shadeTexture = new(() => dalamudAssetManager.GetDalamudTextureWrap(DalamudAsset.TitleScreenMenuShade));