mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 18:27:23 +01:00
Set path for imgui's ini file to the general dalamud data directory, so it won't conflict with other imgui applications and is obvious to users that it is part of dalamud
This commit is contained in:
parent
7321819961
commit
3ca7c6c19c
3 changed files with 8 additions and 3 deletions
|
|
@ -84,7 +84,7 @@ namespace Dalamud {
|
|||
|
||||
this.WinSock2 = new WinSockHandlers();
|
||||
|
||||
this.InterfaceManager = new InterfaceManager(this.sigScanner);
|
||||
this.InterfaceManager = new InterfaceManager(this, this.sigScanner);
|
||||
this.InterfaceManager.OnDraw += BuildDalamudUi;
|
||||
this.InterfaceManager.Enable();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using Dalamud.Game;
|
||||
using Dalamud.Game.Internal.DXGI;
|
||||
|
|
@ -35,6 +36,7 @@ namespace Dalamud.Interface
|
|||
|
||||
private ISwapChainAddressResolver Address { get; }
|
||||
|
||||
private Dalamud dalamud;
|
||||
private RawDX11Scene scene;
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -42,8 +44,10 @@ namespace Dalamud.Interface
|
|||
/// </summary>
|
||||
public event RawDX11Scene.BuildUIDelegate OnDraw;
|
||||
|
||||
public InterfaceManager(SigScanner scanner)
|
||||
public InterfaceManager(Dalamud dalamud, SigScanner scanner)
|
||||
{
|
||||
this.dalamud = dalamud;
|
||||
|
||||
try {
|
||||
var sigResolver = new SwapChainSigResolver();
|
||||
sigResolver.Setup(scanner);
|
||||
|
|
@ -109,6 +113,7 @@ namespace Dalamud.Interface
|
|||
if (this.scene == null)
|
||||
{
|
||||
this.scene = new RawDX11Scene(swapChain);
|
||||
this.scene.ImGuiIniPath = Path.Combine(Path.GetDirectoryName(this.dalamud.StartInfo.ConfigurationPath), "dalamudUI.ini");
|
||||
this.scene.OnBuildUI += Display;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 4fcf95dcd06524b278d42dfa8a9aa1853e375d94
|
||||
Subproject commit 09dde468ea8a6a1729fc8dd334379d1514264742
|
||||
Loading…
Add table
Add a link
Reference in a new issue