ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-01 05:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/apiX' into feature/itextureprovider-updates

Browse source
This commit is contained in:
Soreepeong 2024-06-04 23:54:38 +09:00
commit 0d7c0a0375
335 changed files with 1640 additions and 1020 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs
View file

@ -1,10 +1,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Drawing;
using System.Linq;
using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

2
Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs
View file

@ -49,7 +49,7 @@ internal unsafe class AddonWidget : IDataWindowWidget
}
var addon = (FFXIVClientStructs.FFXIV.Component.GUI.AtkUnitBase*)address;
var name = MemoryHelper.ReadStringNullTerminated((nint)addon->Name);
var name = addon->NameString;
ImGui.TextUnformatted($"{name} - 0x{address.ToInt64():X}\n v:{addon->IsVisible} x:{addon->X} y:{addon->Y} s:{addon->Scale}, w:{addon->RootNode->Width}, h:{addon->RootNode->Height}");
if (ImGui.Button("Find Agent"))

1
Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using Dalamud.Game;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

3
Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Aetherytes;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
@ -82,7 +83,7 @@ internal class AetherytesWidget : IDataWindowWidget
ImGui.TextUnformatted($"{info.IsSharedHouse}");
ImGui.TableNextColumn(); // Apartment
ImGui.TextUnformatted($"{info.IsAppartment}");
ImGui.TextUnformatted($"{info.IsApartment}");
}
ImGui.EndTable();

2
Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs
View file

@ -30,7 +30,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
{
var fontWidth = ImGui.CalcTextSize("A").X;
var fontHeight = ImGui.GetTextLineHeightWithSpacing();
var uiModule = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance()->GetUiModule();
var uiModule = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance()->GetUIModule();
if (uiModule == null)
{

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Conditions;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs
View file

@ -1,5 +1,6 @@
using Dalamud.Configuration.Internal;
using Dalamud.Game.Gui.Dtr;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Fates;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs
View file

@ -1,6 +1,7 @@
using System.Numerics;
using Dalamud.Game.Gui.FlyText;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.GamePad;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs
View file

@ -1,5 +1,6 @@
using Dalamud.Game.ClientState.Keys;
using Dalamud.Interface.Colors;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

3
Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs
View file

@ -1,14 +1,13 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text.RegularExpressions;
using Dalamud.Data;
using Dalamud.Game.Network;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Memory;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

2
Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs
View file

@ -81,7 +81,7 @@ internal class ObjectTableWidget : IDataWindowWidget
// So, while WorldToScreen will return false if the point is off of game client screen, to
// to avoid performance issues, we have to manually determine if creating a window would
// produce a new viewport, and skip rendering it if so
var objectText = $"{obj.Address.ToInt64():X}:{obj.ObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
var objectText = $"{obj.Address.ToInt64():X}:{obj.GameObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
var screenPos = ImGui.GetMainViewport().Pos;
var screenSize = ImGui.GetMainViewport().Size;

2
Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs
View file

@ -48,7 +48,7 @@ internal class PartyListWidget : IDataWindowWidget
continue;
}
ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject?.ObjectId}");
ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject?.GameObjectId}");
if (this.resolveGameData)
{
var actor = member.GameObject;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs
View file

@ -7,6 +7,7 @@ using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.IoC.Internal;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs
View file

@ -2,6 +2,7 @@
using Dalamud.Game.Gui.Toast;
using Dalamud.Interface.Utility;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
View file

@ -1,6 +1,7 @@
using System.Numerics;
using Dalamud.Data;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;