mirror of
https://github.com/goatcorp/Dalamud.git
synced 2026-02-07 08:24:37 +01:00
Apply ImRaii to Widgets Part 2 (#2567)
* Apply ImRaii to multiple widgets * Apply ImRaii to leftover widgets
This commit is contained in:
Infi
GitHub
parent
672636c3bf
commit
8f8f4faa12
25 changed files with 411 additions and 484 deletions
|
|
@ -8,7 +8,7 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// <summary>
|
||||
/// Widget for displaying Addon Data.
|
||||
/// </summary>
|
||||
internal unsafe class AddonWidget : IDataWindowWidget
|
||||
internal class AddonWidget : IDataWindowWidget
|
||||
{
|
||||
private string inputAddonName = string.Empty;
|
||||
private int inputAddonIndex;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System.Collections.Generic;
|
|||
|
||||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
using Dalamud.Utility;
|
||||
|
||||
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
||||
|
|
@ -46,22 +47,24 @@ internal class AddressesWidget : IDataWindowWidget
|
|||
}
|
||||
}
|
||||
|
||||
ImGui.Text($"Result: {this.sigResult.ToInt64():X}");
|
||||
ImGui.AlignTextToFramePadding();
|
||||
ImGui.Text($"Result: {this.sigResult:X}");
|
||||
ImGui.SameLine();
|
||||
if (ImGui.Button($"C##{this.sigResult.ToInt64():X}"))
|
||||
ImGui.SetClipboardText(this.sigResult.ToInt64().ToString("X"));
|
||||
if (ImGui.Button($"C##{this.sigResult:X}"))
|
||||
ImGui.SetClipboardText($"{this.sigResult:X}");
|
||||
|
||||
foreach (var debugScannedValue in BaseAddressResolver.DebugScannedValues)
|
||||
{
|
||||
ImGui.Text($"{debugScannedValue.Key}");
|
||||
foreach (var valueTuple in debugScannedValue.Value)
|
||||
{
|
||||
ImGui.Text(
|
||||
$" {valueTuple.ClassName} - {Util.DescribeAddress(valueTuple.Address)}");
|
||||
using var indent = ImRaii.PushIndent(10.0f);
|
||||
ImGui.AlignTextToFramePadding();
|
||||
ImGui.Text($"{valueTuple.ClassName} - {Util.DescribeAddress(valueTuple.Address)}");
|
||||
ImGui.SameLine();
|
||||
|
||||
if (ImGui.Button($"C##{valueTuple.Address.ToInt64():X}"))
|
||||
ImGui.SetClipboardText(valueTuple.Address.ToInt64().ToString("X"));
|
||||
if (ImGui.Button($"C##{valueTuple.Address:X}"))
|
||||
ImGui.SetClipboardText($"{valueTuple.Address:X}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game.ClientState.Aetherytes;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
|
||||
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
||||
|
||||
|
|
@ -8,6 +9,8 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class AetherytesWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public bool Ready { get; set; }
|
||||
|
||||
|
|
@ -26,7 +29,8 @@ internal class AetherytesWidget : IDataWindowWidget
|
|||
/// <inheritdoc/>
|
||||
public void Draw()
|
||||
{
|
||||
if (!ImGui.BeginTable("##aetheryteTable"u8, 11, ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders))
|
||||
using var table = ImRaii.Table("##aetheryteTable"u8, 11, TableFlags);
|
||||
if (!table.Success)
|
||||
return;
|
||||
|
||||
ImGui.TableSetupScrollFreeze(0, 1);
|
||||
|
|
@ -84,7 +88,5 @@ internal class AetherytesWidget : IDataWindowWidget
|
|||
ImGui.TableNextColumn(); // Apartment
|
||||
ImGui.Text($"{info.IsApartment}");
|
||||
}
|
||||
|
||||
ImGui.EndTable();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
|
|||
private int selectedExtendArray;
|
||||
|
||||
private string searchTerm = string.Empty;
|
||||
private bool hideUnsetStringArrayEntries = false;
|
||||
private bool hideUnsetExtendArrayEntries = false;
|
||||
private bool showTextAddress = false;
|
||||
private bool showMacroString = false;
|
||||
private bool hideUnsetStringArrayEntries;
|
||||
private bool hideUnsetExtendArrayEntries;
|
||||
private bool showTextAddress;
|
||||
private bool showMacroString;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public bool Ready { get; set; }
|
||||
|
|
@ -155,17 +155,14 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
|
|||
if (ImGui.IsItemHovered())
|
||||
{
|
||||
using var tooltip = ImRaii.Tooltip();
|
||||
if (tooltip)
|
||||
|
||||
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
|
||||
for (var j = 0; j < array->SubscribedAddonsCount; j++)
|
||||
{
|
||||
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
|
||||
if (array->SubscribedAddons[j] == 0)
|
||||
continue;
|
||||
|
||||
for (var j = 0; j < array->SubscribedAddonsCount; j++)
|
||||
{
|
||||
if (array->SubscribedAddons[j] == 0)
|
||||
continue;
|
||||
|
||||
ImGui.Text(raptureAtkUnitManager->GetAddonById(array->SubscribedAddons[j])->NameString);
|
||||
}
|
||||
ImGui.Text(raptureAtkUnitManager->GetAddonById(array->SubscribedAddons[j])->NameString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -244,9 +241,9 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
|
|||
|
||||
var atkArrayDataHolder = RaptureAtkModule.Instance()->AtkArrayDataHolder;
|
||||
|
||||
using (var sidebarchild = ImRaii.Child("StringArraySidebar"u8, new Vector2(300, -1), false, ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoSavedSettings))
|
||||
using (var sidebarChild = ImRaii.Child("StringArraySidebar"u8, new Vector2(300, -1), false, ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoSavedSettings))
|
||||
{
|
||||
if (sidebarchild)
|
||||
if (sidebarChild)
|
||||
{
|
||||
ImGui.SetNextItemWidth(-1);
|
||||
ImGui.InputTextWithHint("##TextSearch"u8, "Search..."u8, ref this.searchTerm, 256, ImGuiInputTextFlags.AutoSelectAll);
|
||||
|
|
|
|||
|
|
@ -32,18 +32,65 @@ internal class BuddyListWidget : IDataWindowWidget
|
|||
var buddyList = Service<BuddyList>.Get();
|
||||
|
||||
ImGui.Checkbox("Resolve GameData"u8, ref this.resolveGameData);
|
||||
|
||||
var companionBuddy = buddyList.CompanionBuddy;
|
||||
if (companionBuddy == null)
|
||||
{
|
||||
var member = buddyList.CompanionBuddy;
|
||||
if (member == null)
|
||||
ImGui.Text("[Companion] null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
ImGui.Text($"[Companion] {companionBuddy.Address:X} - {companionBuddy.EntityId} - {companionBuddy.DataID}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
ImGui.Text("[Companion] null"u8);
|
||||
var gameObject = companionBuddy.GameObject;
|
||||
if (gameObject == null)
|
||||
{
|
||||
ImGui.Text("GameObject was null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
Util.PrintGameObject(gameObject, "-", this.resolveGameData);
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
var petBuddy = buddyList.PetBuddy;
|
||||
if (petBuddy == null)
|
||||
{
|
||||
ImGui.Text("[Pet] null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
ImGui.Text($"[Pet] {petBuddy.Address:X} - {petBuddy.EntityId} - {petBuddy.DataID}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
ImGui.Text($"[Companion] {member.Address.ToInt64():X} - {member.EntityId} - {member.DataID}");
|
||||
var gameObject = petBuddy.GameObject;
|
||||
if (gameObject == null)
|
||||
{
|
||||
ImGui.Text("GameObject was null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
Util.PrintGameObject(gameObject, "-", this.resolveGameData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var count = buddyList.Length;
|
||||
if (count == 0)
|
||||
{
|
||||
ImGui.Text("[BattleBuddy] None present"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
var member = buddyList[i];
|
||||
ImGui.Text($"[BattleBuddy] [{i}] {member?.Address ?? 0:X} - {member?.EntityId ?? 0} - {member?.DataID ?? 0}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
var gameObject = member.GameObject;
|
||||
var gameObject = member?.GameObject;
|
||||
if (gameObject == null)
|
||||
{
|
||||
ImGui.Text("GameObject was null"u8);
|
||||
|
|
@ -55,57 +102,5 @@ internal class BuddyListWidget : IDataWindowWidget
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var member = buddyList.PetBuddy;
|
||||
if (member == null)
|
||||
{
|
||||
ImGui.Text("[Pet] null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
ImGui.Text($"[Pet] {member.Address.ToInt64():X} - {member.EntityId} - {member.DataID}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
var gameObject = member.GameObject;
|
||||
if (gameObject == null)
|
||||
{
|
||||
ImGui.Text("GameObject was null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
Util.PrintGameObject(gameObject, "-", this.resolveGameData);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var count = buddyList.Length;
|
||||
if (count == 0)
|
||||
{
|
||||
ImGui.Text("[BattleBuddy] None present"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
var member = buddyList[i];
|
||||
ImGui.Text($"[BattleBuddy] [{i}] {member?.Address.ToInt64():X} - {member?.EntityId} - {member?.DataID}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
var gameObject = member?.GameObject;
|
||||
if (gameObject == null)
|
||||
{
|
||||
ImGui.Text("GameObject was null"u8);
|
||||
}
|
||||
else
|
||||
{
|
||||
Util.PrintGameObject(gameObject, "-", this.resolveGameData);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class CommandWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.ScrollY | ImGuiTableFlags.Borders |
|
||||
ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.Sortable |
|
||||
ImGuiTableFlags.SortTristate;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public string[]? CommandShortcuts { get; init; } = ["command"];
|
||||
|
||||
|
|
@ -31,9 +35,7 @@ internal class CommandWidget : IDataWindowWidget
|
|||
{
|
||||
var commandManager = Service<CommandManager>.Get();
|
||||
|
||||
var tableFlags = ImGuiTableFlags.ScrollY | ImGuiTableFlags.Borders | ImGuiTableFlags.SizingStretchProp |
|
||||
ImGuiTableFlags.Sortable | ImGuiTableFlags.SortTristate;
|
||||
using var table = ImRaii.Table("CommandList"u8, 4, tableFlags);
|
||||
using var table = ImRaii.Table("CommandList"u8, 4, TableFlags);
|
||||
if (table)
|
||||
{
|
||||
ImGui.TableSetupScrollFreeze(0, 1);
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ internal class ConfigurationWidget : IDataWindowWidget
|
|||
{
|
||||
/// <inheritdoc/>
|
||||
public string[]? CommandShortcuts { get; init; } = ["config", "configuration"];
|
||||
|
||||
|
||||
/// <inheritdoc/>
|
||||
public string DisplayName { get; init; } = "Configuration";
|
||||
public string DisplayName { get; init; } = "Configuration";
|
||||
|
||||
/// <inheritdoc/>
|
||||
public bool Ready { get; set; }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
using System.Reflection;
|
||||
|
|
@ -21,13 +20,9 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// <summary>
|
||||
/// Widget for displaying plugin data share modules.
|
||||
/// </summary>
|
||||
[SuppressMessage(
|
||||
"StyleCop.CSharp.LayoutRules",
|
||||
"SA1519:Braces should not be omitted from multi-line child statement",
|
||||
Justification = "Multiple fixed blocks")]
|
||||
internal class DataShareWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTabItemFlags NoCloseButton = (ImGuiTabItemFlags)(1 << 20);
|
||||
private const ImGuiTabItemFlags NoCloseButton = (ImGuiTabItemFlags)ImGuiTabItemFlagsPrivate.NoCloseButton;
|
||||
|
||||
private readonly List<(string Name, byte[]? Data)> dataView = [];
|
||||
private int nextTab = -1;
|
||||
|
|
@ -50,42 +45,37 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public unsafe void Draw()
|
||||
public void Draw()
|
||||
{
|
||||
using var tabbar = ImRaii.TabBar("##tabbar"u8);
|
||||
if (!tabbar.Success)
|
||||
return;
|
||||
|
||||
var d = true;
|
||||
using (var tabitem = ImRaii.TabItem(
|
||||
"Data Share##tabbar-datashare"u8,
|
||||
ref d,
|
||||
NoCloseButton | (this.nextTab == 0 ? ImGuiTabItemFlags.SetSelected : 0)))
|
||||
using (var tabItem = ImRaii.TabItem("Data Share##tabbar-datashare"u8, ref d, NoCloseButton | (this.nextTab == 0 ? ImGuiTabItemFlags.SetSelected : 0)))
|
||||
{
|
||||
if (tabitem.Success)
|
||||
if (tabItem.Success)
|
||||
this.DrawDataShare();
|
||||
}
|
||||
|
||||
using (var tabitem = ImRaii.TabItem(
|
||||
"Call Gate##tabbar-callgate"u8,
|
||||
ref d,
|
||||
NoCloseButton | (this.nextTab == 1 ? ImGuiTabItemFlags.SetSelected : 0)))
|
||||
using (var tabItem = ImRaii.TabItem("Call Gate##tabbar-callgate"u8, ref d, NoCloseButton | (this.nextTab == 1 ? ImGuiTabItemFlags.SetSelected : 0)))
|
||||
{
|
||||
if (tabitem.Success)
|
||||
if (tabItem.Success)
|
||||
this.DrawCallGate();
|
||||
}
|
||||
|
||||
for (var i = 0; i < this.dataView.Count; i++)
|
||||
{
|
||||
using var idpush = ImRaii.PushId($"##tabbar-data-{i}");
|
||||
|
||||
var (name, data) = this.dataView[i];
|
||||
d = true;
|
||||
using var tabitem = ImRaii.TabItem(
|
||||
name,
|
||||
ref d,
|
||||
this.nextTab == 2 + i ? ImGuiTabItemFlags.SetSelected : 0);
|
||||
|
||||
using var tabitem = ImRaii.TabItem(name, ref d, this.nextTab == 2 + i ? ImGuiTabItemFlags.SetSelected : 0);
|
||||
|
||||
if (!d)
|
||||
this.dataView.RemoveAt(i--);
|
||||
|
||||
if (!tabitem.Success)
|
||||
continue;
|
||||
|
||||
|
|
@ -123,11 +113,7 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
if (ImGui.Button("Copy"u8))
|
||||
ImGui.SetClipboardText(data);
|
||||
|
||||
ImGui.InputTextMultiline(
|
||||
"text"u8,
|
||||
data,
|
||||
ImGui.GetContentRegionAvail(),
|
||||
ImGuiInputTextFlags.ReadOnly);
|
||||
ImGui.InputTextMultiline("text"u8, data, ImGui.GetContentRegionAvail(), ImGuiInputTextFlags.ReadOnly);
|
||||
}
|
||||
|
||||
this.nextTab = -1;
|
||||
|
|
@ -142,8 +128,10 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
sb.Append(ReprType(mi.DeclaringType))
|
||||
.Append("::")
|
||||
.Append(mi.Name);
|
||||
|
||||
if (!withParams)
|
||||
return sb.ToString();
|
||||
|
||||
sb.Append('(');
|
||||
var parfirst = true;
|
||||
foreach (var par in mi.GetParameters())
|
||||
|
|
@ -152,6 +140,7 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
sb.Append(", ");
|
||||
else
|
||||
parfirst = false;
|
||||
|
||||
sb.AppendLine()
|
||||
.Append('\t')
|
||||
.Append(ReprType(par.ParameterType))
|
||||
|
|
@ -161,9 +150,11 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
|
||||
if (!parfirst)
|
||||
sb.AppendLine();
|
||||
|
||||
sb.Append(')');
|
||||
if (mi.ReturnType != typeof(void))
|
||||
sb.Append(" -> ").Append(ReprType(mi.ReturnType));
|
||||
|
||||
return sb.ToString();
|
||||
|
||||
static string WithoutGeneric(string s)
|
||||
|
|
@ -172,8 +163,7 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
return i != -1 ? s[..i] : s;
|
||||
}
|
||||
|
||||
static string ReprType(Type? t) =>
|
||||
t switch
|
||||
static string ReprType(Type? t) => t switch
|
||||
{
|
||||
null => "null",
|
||||
_ when t == typeof(string) => "string",
|
||||
|
|
@ -215,18 +205,19 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
var offset = ImGui.GetCursorScreenPos() + new Vector2(0, framepad ? ImGui.GetStyle().FramePadding.Y : 0);
|
||||
if (framepad)
|
||||
ImGui.AlignTextToFramePadding();
|
||||
|
||||
ImGui.Text(s);
|
||||
if (ImGui.IsItemHovered())
|
||||
{
|
||||
ImGui.SetNextWindowPos(offset - ImGui.GetStyle().WindowPadding);
|
||||
var vp = ImGui.GetWindowViewport();
|
||||
var wrx = (vp.WorkPos.X + vp.WorkSize.X) - offset.X;
|
||||
|
||||
ImGui.SetNextWindowSizeConstraints(Vector2.One, new(wrx, float.MaxValue));
|
||||
using (ImRaii.Tooltip())
|
||||
{
|
||||
ImGui.PushTextWrapPos(wrx);
|
||||
using var pushedWrap = ImRaii.TextWrapPos(wrx);
|
||||
ImGui.TextWrapped(tooltip?.Invoke() ?? s);
|
||||
ImGui.PopTextWrapPos();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -247,6 +238,9 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
callGate.PurgeEmptyGates();
|
||||
|
||||
using var table = ImRaii.Table("##callgate-table"u8, 5);
|
||||
if (!table.Success)
|
||||
return;
|
||||
|
||||
ImGui.TableSetupColumn("Name"u8, ImGuiTableColumnFlags.DefaultSort);
|
||||
ImGui.TableSetupColumn("Action"u8);
|
||||
ImGui.TableSetupColumn("Func"u8);
|
||||
|
|
@ -268,12 +262,8 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
{
|
||||
ImGui.TableNextRow();
|
||||
this.DrawTextCell(item.Name);
|
||||
this.DrawTextCell(
|
||||
ReprMethod(item.Action?.Method, false),
|
||||
() => ReprMethod(item.Action?.Method, true));
|
||||
this.DrawTextCell(
|
||||
ReprMethod(item.Func?.Method, false),
|
||||
() => ReprMethod(item.Func?.Method, true));
|
||||
this.DrawTextCell(ReprMethod(item.Action?.Method, false), () => ReprMethod(item.Action?.Method, true));
|
||||
this.DrawTextCell(ReprMethod(item.Func?.Method, false), () => ReprMethod(item.Func?.Method, true));
|
||||
if (subs.Count == 0)
|
||||
{
|
||||
this.DrawTextCell("0");
|
||||
|
|
@ -288,47 +278,43 @@ internal class DataShareWidget : IDataWindowWidget
|
|||
|
||||
private void DrawDataShare()
|
||||
{
|
||||
if (!ImGui.BeginTable("###DataShareTable"u8, 5, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg))
|
||||
using var table = ImRaii.Table("###DataShareTable"u8, 5, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg);
|
||||
if (!table.Success)
|
||||
return;
|
||||
|
||||
try
|
||||
ImGui.TableSetupColumn("Shared Tag"u8);
|
||||
ImGui.TableSetupColumn("Show"u8);
|
||||
ImGui.TableSetupColumn("Creator Assembly"u8);
|
||||
ImGui.TableSetupColumn("#"u8, ImGuiTableColumnFlags.WidthFixed, 30 * ImGuiHelpers.GlobalScale);
|
||||
ImGui.TableSetupColumn("Consumers"u8);
|
||||
ImGui.TableHeadersRow();
|
||||
|
||||
foreach (var share in Service<DataShare>.Get().GetAllShares())
|
||||
{
|
||||
ImGui.TableSetupColumn("Shared Tag"u8);
|
||||
ImGui.TableSetupColumn("Show"u8);
|
||||
ImGui.TableSetupColumn("Creator Assembly"u8);
|
||||
ImGui.TableSetupColumn("#"u8, ImGuiTableColumnFlags.WidthFixed, 30 * ImGuiHelpers.GlobalScale);
|
||||
ImGui.TableSetupColumn("Consumers"u8);
|
||||
ImGui.TableHeadersRow();
|
||||
foreach (var share in Service<DataShare>.Get().GetAllShares())
|
||||
ImGui.TableNextRow();
|
||||
this.DrawTextCell(share.Tag, null, true);
|
||||
|
||||
ImGui.TableNextColumn();
|
||||
if (ImGui.Button($"Show##datasharetable-show-{share.Tag}"))
|
||||
{
|
||||
ImGui.TableNextRow();
|
||||
this.DrawTextCell(share.Tag, null, true);
|
||||
|
||||
ImGui.TableNextColumn();
|
||||
if (ImGui.Button($"Show##datasharetable-show-{share.Tag}"))
|
||||
var index = 0;
|
||||
for (; index < this.dataView.Count; index++)
|
||||
{
|
||||
var index = 0;
|
||||
for (; index < this.dataView.Count; index++)
|
||||
{
|
||||
if (this.dataView[index].Name == share.Tag)
|
||||
break;
|
||||
}
|
||||
|
||||
if (index == this.dataView.Count)
|
||||
this.dataView.Add((share.Tag, null));
|
||||
else
|
||||
this.dataView[index] = (share.Tag, null);
|
||||
this.nextTab = 2 + index;
|
||||
if (this.dataView[index].Name == share.Tag)
|
||||
break;
|
||||
}
|
||||
|
||||
this.DrawTextCell(share.CreatorAssembly, null, true);
|
||||
this.DrawTextCell(share.Users.Length.ToString(), null, true);
|
||||
this.DrawTextCell(string.Join(", ", share.Users), null, true);
|
||||
if (index == this.dataView.Count)
|
||||
this.dataView.Add((share.Tag, null));
|
||||
else
|
||||
this.dataView[index] = (share.Tag, null);
|
||||
|
||||
this.nextTab = 2 + index;
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
ImGui.EndTable();
|
||||
|
||||
this.DrawTextCell(share.CreatorAssembly, null, true);
|
||||
this.DrawTextCell(share.Users.Length.ToString(), null, true);
|
||||
this.DrawTextCell(string.Join(", ", share.Users), null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class FateTableWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg |
|
||||
ImGuiTableFlags.Borders | ImGuiTableFlags.NoSavedSettings;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public string[]? CommandShortcuts { get; init; } = ["fate", "fatetable"];
|
||||
|
||||
|
|
@ -37,7 +40,7 @@ internal class FateTableWidget : IDataWindowWidget
|
|||
return;
|
||||
}
|
||||
|
||||
using var table = ImRaii.Table("FateTable"u8, 13, ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders | ImGuiTableFlags.NoSavedSettings);
|
||||
using var table = ImRaii.Table("FateTable"u8, 13, TableFlags);
|
||||
if (!table) return;
|
||||
|
||||
ImGui.TableSetupColumn("Index"u8, ImGuiTableColumnFlags.WidthFixed, 40);
|
||||
|
|
@ -97,11 +100,11 @@ internal class FateTableWidget : IDataWindowWidget
|
|||
if (ImGui.IsItemHovered())
|
||||
{
|
||||
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
|
||||
ImGui.BeginTooltip();
|
||||
|
||||
using var tooltip = ImRaii.Tooltip();
|
||||
ImGui.Text("Click to copy IconId"u8);
|
||||
ImGui.Text($"ID: {fate.IconId} – Size: {texture.Width}x{texture.Height}");
|
||||
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
|
||||
ImGui.EndTooltip();
|
||||
}
|
||||
|
||||
if (ImGui.IsItemClicked())
|
||||
|
|
@ -122,11 +125,11 @@ internal class FateTableWidget : IDataWindowWidget
|
|||
if (ImGui.IsItemHovered())
|
||||
{
|
||||
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
|
||||
ImGui.BeginTooltip();
|
||||
|
||||
using var tooltip = ImRaii.Tooltip();
|
||||
ImGui.Text("Click to copy MapIconId"u8);
|
||||
ImGui.Text($"ID: {fate.MapIconId} – Size: {texture.Width}x{texture.Height}");
|
||||
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
|
||||
ImGui.EndTooltip();
|
||||
}
|
||||
|
||||
if (ImGui.IsItemClicked())
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Numerics;
|
|||
|
||||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game.Gui.FlyText;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
|
||||
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
||||
|
||||
|
|
@ -39,18 +40,18 @@ internal class FlyTextWidget : IDataWindowWidget
|
|||
/// <inheritdoc/>
|
||||
public void Draw()
|
||||
{
|
||||
if (ImGui.BeginCombo("Kind"u8, $"{this.flyKind} ({(int)this.flyKind})"))
|
||||
using (var combo = ImRaii.Combo("Kind"u8, $"{this.flyKind} ({(int)this.flyKind})"))
|
||||
{
|
||||
var values = Enum.GetValues<FlyTextKind>().Distinct();
|
||||
foreach (var value in values)
|
||||
if (combo.Success)
|
||||
{
|
||||
if (ImGui.Selectable($"{value} ({(int)value})"))
|
||||
foreach (var value in Enum.GetValues<FlyTextKind>().Distinct())
|
||||
{
|
||||
this.flyKind = value;
|
||||
if (ImGui.Selectable($"{value} ({(int)value})"))
|
||||
{
|
||||
this.flyKind = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ImGui.EndCombo();
|
||||
}
|
||||
|
||||
ImGui.InputText("Text1"u8, ref this.flyText1, 200);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ using Dalamud.Interface.ImGuiFontChooserDialog;
|
|||
using Dalamud.Interface.ManagedFontAtlas;
|
||||
using Dalamud.Interface.ManagedFontAtlas.Internals;
|
||||
using Dalamud.Interface.Utility;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
using Dalamud.Utility;
|
||||
|
||||
using Serilog;
|
||||
|
|
@ -248,7 +249,8 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
|
|||
{
|
||||
ImGui.Text($"{gfs.SizePt}pt");
|
||||
ImGui.SameLine(offsetX);
|
||||
ImGui.PushTextWrapPos(this.useWordWrap ? 0f : -1f);
|
||||
|
||||
using var pushedWrap = ImRaii.TextWrapPos(this.useWordWrap ? 0f : -1f);
|
||||
try
|
||||
{
|
||||
if (handle.Value.LoadException is { } exc)
|
||||
|
|
@ -263,6 +265,7 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
|
|||
{
|
||||
if (!this.atlasScaleMode)
|
||||
ImGui.SetWindowFontScale(1 / ImGuiHelpers.GlobalScale);
|
||||
|
||||
if (counter++ % 2 == 0)
|
||||
{
|
||||
using var pushPop = handle.Value.Push();
|
||||
|
|
@ -279,7 +282,6 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
|
|||
finally
|
||||
{
|
||||
ImGui.SetWindowFontScale(1);
|
||||
ImGui.PopTextWrapPos();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,22 +39,10 @@ internal class GamepadWidget : IDataWindowWidget
|
|||
ImGui.SetClipboardText($"{Util.DescribeAddress(gamepadState.GamepadInputAddress)}");
|
||||
#endif
|
||||
|
||||
this.DrawHelper(
|
||||
"Buttons Raw",
|
||||
(uint)gamepadState.ButtonsRaw,
|
||||
gamepadState.Raw);
|
||||
this.DrawHelper(
|
||||
"Buttons Pressed",
|
||||
(uint)gamepadState.ButtonsPressed,
|
||||
gamepadState.Pressed);
|
||||
this.DrawHelper(
|
||||
"Buttons Repeat",
|
||||
(uint)gamepadState.ButtonsRepeat,
|
||||
gamepadState.Repeat);
|
||||
this.DrawHelper(
|
||||
"Buttons Released",
|
||||
(uint)gamepadState.ButtonsReleased,
|
||||
gamepadState.Released);
|
||||
this.DrawHelper("Buttons Raw", (uint)gamepadState.ButtonsRaw, gamepadState.Raw);
|
||||
this.DrawHelper("Buttons Pressed", (uint)gamepadState.ButtonsPressed, gamepadState.Pressed);
|
||||
this.DrawHelper("Buttons Repeat", (uint)gamepadState.ButtonsRepeat, gamepadState.Repeat);
|
||||
this.DrawHelper("Buttons Released", (uint)gamepadState.ButtonsReleased, gamepadState.Released);
|
||||
ImGui.Text($"LeftStick {gamepadState.LeftStick}");
|
||||
ImGui.Text($"RightStick {gamepadState.RightStick}");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ internal class GaugeWidget : IDataWindowWidget
|
|||
return;
|
||||
}
|
||||
|
||||
var jobID = player.ClassJob.RowId;
|
||||
JobGaugeBase? gauge = jobID switch
|
||||
JobGaugeBase? gauge = player.ClassJob.RowId switch
|
||||
{
|
||||
19 => jobGauges.Get<PLDGauge>(),
|
||||
20 => jobGauges.Get<MNKGauge>(),
|
||||
|
|
@ -63,7 +62,7 @@ internal class GaugeWidget : IDataWindowWidget
|
|||
40 => jobGauges.Get<SGEGauge>(),
|
||||
41 => jobGauges.Get<VPRGauge>(),
|
||||
42 => jobGauges.Get<PCTGauge>(),
|
||||
_ => null,
|
||||
_ => null
|
||||
};
|
||||
|
||||
if (gauge == null)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using System.Threading.Tasks;
|
|||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game;
|
||||
using Dalamud.Hooking;
|
||||
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||
|
||||
using Serilog;
|
||||
|
|
@ -26,12 +26,12 @@ internal unsafe class HookWidget : IDataWindowWidget
|
|||
private Hook<MessageBoxWDelegate>? messageBoxMinHook;
|
||||
private bool hookUseMinHook;
|
||||
|
||||
private int hookStressTestCount = 0;
|
||||
private int hookStressTestCount;
|
||||
private int hookStressTestMax = 1000;
|
||||
private int hookStressTestWait = 100;
|
||||
private int hookStressTestMaxDegreeOfParallelism = 10;
|
||||
private StressTestHookTarget hookStressTestHookTarget = StressTestHookTarget.Random;
|
||||
private bool hookStressTestRunning = false;
|
||||
private bool hookStressTestRunning;
|
||||
|
||||
private MessageBoxWDelegate? messageBoxWOriginal;
|
||||
private AddonFinalizeDelegate? addonFinalizeOriginal;
|
||||
|
|
@ -50,7 +50,7 @@ internal unsafe class HookWidget : IDataWindowWidget
|
|||
{
|
||||
MessageBoxW,
|
||||
AddonFinalize,
|
||||
Random,
|
||||
Random
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
|
@ -106,67 +106,68 @@ internal unsafe class HookWidget : IDataWindowWidget
|
|||
|
||||
ImGui.Separator();
|
||||
|
||||
ImGui.BeginDisabled(this.hookStressTestRunning);
|
||||
ImGui.Text("Stress Test"u8);
|
||||
|
||||
if (ImGui.InputInt("Max"u8, ref this.hookStressTestMax))
|
||||
this.hookStressTestCount = 0;
|
||||
|
||||
ImGui.InputInt("Wait (ms)"u8, ref this.hookStressTestWait);
|
||||
ImGui.InputInt("Max Degree of Parallelism"u8, ref this.hookStressTestMaxDegreeOfParallelism);
|
||||
|
||||
if (ImGui.BeginCombo("Target"u8, HookTargetToString(this.hookStressTestHookTarget)))
|
||||
using (ImRaii.Disabled(this.hookStressTestRunning))
|
||||
{
|
||||
foreach (var target in Enum.GetValues<StressTestHookTarget>())
|
||||
ImGui.Text("Stress Test"u8);
|
||||
|
||||
if (ImGui.InputInt("Max"u8, ref this.hookStressTestMax))
|
||||
this.hookStressTestCount = 0;
|
||||
|
||||
ImGui.InputInt("Wait (ms)"u8, ref this.hookStressTestWait);
|
||||
ImGui.InputInt("Max Degree of Parallelism"u8, ref this.hookStressTestMaxDegreeOfParallelism);
|
||||
|
||||
using (var combo = ImRaii.Combo("Target"u8, HookTargetToString(this.hookStressTestHookTarget)))
|
||||
{
|
||||
if (ImGui.Selectable(HookTargetToString(target), this.hookStressTestHookTarget == target))
|
||||
this.hookStressTestHookTarget = target;
|
||||
if (combo.Success)
|
||||
{
|
||||
foreach (var target in Enum.GetValues<StressTestHookTarget>())
|
||||
{
|
||||
if (ImGui.Selectable(HookTargetToString(target), this.hookStressTestHookTarget == target))
|
||||
this.hookStressTestHookTarget = target;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ImGui.EndCombo();
|
||||
}
|
||||
|
||||
if (ImGui.Button("Stress Test"u8))
|
||||
{
|
||||
Task.Run(() =>
|
||||
if (ImGui.Button("Stress Test"u8))
|
||||
{
|
||||
this.hookStressTestRunning = true;
|
||||
this.hookStressTestCount = 0;
|
||||
Parallel.For(
|
||||
0,
|
||||
this.hookStressTestMax,
|
||||
new ParallelOptions
|
||||
Task.Run(() =>
|
||||
{
|
||||
this.hookStressTestRunning = true;
|
||||
this.hookStressTestCount = 0;
|
||||
Parallel.For(
|
||||
0,
|
||||
this.hookStressTestMax,
|
||||
new ParallelOptions
|
||||
{
|
||||
MaxDegreeOfParallelism = this.hookStressTestMaxDegreeOfParallelism,
|
||||
},
|
||||
_ =>
|
||||
{
|
||||
this.hookStressTestList.Add(this.HookTarget(this.hookStressTestHookTarget));
|
||||
this.hookStressTestCount++;
|
||||
Thread.Sleep(this.hookStressTestWait);
|
||||
});
|
||||
}).ContinueWith(t =>
|
||||
{
|
||||
if (t.IsFaulted)
|
||||
{
|
||||
MaxDegreeOfParallelism = this.hookStressTestMaxDegreeOfParallelism,
|
||||
},
|
||||
_ =>
|
||||
Log.Error(t.Exception, "Stress test failed");
|
||||
}
|
||||
else
|
||||
{
|
||||
this.hookStressTestList.Add(this.HookTarget(this.hookStressTestHookTarget));
|
||||
this.hookStressTestCount++;
|
||||
Thread.Sleep(this.hookStressTestWait);
|
||||
Log.Information("Stress test completed");
|
||||
}
|
||||
|
||||
this.hookStressTestRunning = false;
|
||||
this.hookStressTestList.ForEach(hook =>
|
||||
{
|
||||
hook.Dispose();
|
||||
});
|
||||
}).ContinueWith(t =>
|
||||
{
|
||||
if (t.IsFaulted)
|
||||
{
|
||||
Log.Error(t.Exception, "Stress test failed");
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Information("Stress test completed");
|
||||
}
|
||||
|
||||
this.hookStressTestRunning = false;
|
||||
this.hookStressTestList.ForEach(hook =>
|
||||
{
|
||||
hook.Dispose();
|
||||
this.hookStressTestList.Clear();
|
||||
});
|
||||
this.hookStressTestList.Clear();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ImGui.EndDisabled();
|
||||
|
||||
ImGui.Text("Status: " + (this.hookStressTestRunning ? "Running" : "Idle"));
|
||||
ImGui.ProgressBar(this.hookStressTestCount / (float)this.hookStressTestMax, new System.Numerics.Vector2(0, 0), $"{this.hookStressTestCount}/{this.hookStressTestMax}");
|
||||
}
|
||||
|
|
@ -206,11 +207,6 @@ internal unsafe class HookWidget : IDataWindowWidget
|
|||
this.addonFinalizeOriginal!(unitManager, atkUnitBase);
|
||||
}
|
||||
|
||||
private void OnAddonUpdate(AtkUnitBase* thisPtr, float delta)
|
||||
{
|
||||
Log.Information("OnAddonUpdate");
|
||||
}
|
||||
|
||||
private IDalamudHook HookMessageBoxW()
|
||||
{
|
||||
var hook = Hook<MessageBoxWDelegate>.FromSymbol(
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using Dalamud.Interface.Textures.Internal;
|
|||
using Dalamud.Interface.Textures.TextureWraps;
|
||||
using Dalamud.Interface.Utility;
|
||||
using Dalamud.Interface.Utility.Internal;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
|
||||
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
||||
|
||||
|
|
@ -62,6 +63,7 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
// continue;
|
||||
if (!texm.TryGetIconPath(new((uint)iconId), out var path))
|
||||
continue;
|
||||
|
||||
result.Add((iconId, path));
|
||||
}
|
||||
|
||||
|
|
@ -82,17 +84,17 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
{
|
||||
this.RecalculateIndexRange();
|
||||
|
||||
if (ImGui.BeginChild("ScrollableSection"u8, ImGui.GetContentRegionAvail(), false, ImGuiWindowFlags.NoMove))
|
||||
using (var child = ImRaii.Child("ScrollableSection"u8, ImGui.GetContentRegionAvail(), false, ImGuiWindowFlags.NoMove))
|
||||
{
|
||||
var itemsPerRow = (int)MathF.Floor(
|
||||
ImGui.GetContentRegionMax().X / (this.iconSize.X + ImGui.GetStyle().ItemSpacing.X));
|
||||
var itemHeight = this.iconSize.Y + ImGui.GetStyle().ItemSpacing.Y;
|
||||
if (child.Success)
|
||||
{
|
||||
var itemsPerRow = (int)MathF.Floor(ImGui.GetContentRegionMax().X / (this.iconSize.X + ImGui.GetStyle().ItemSpacing.X));
|
||||
var itemHeight = this.iconSize.Y + ImGui.GetStyle().ItemSpacing.Y;
|
||||
|
||||
ImGuiClip.ClippedDraw(this.valueRange!, this.DrawIcon, itemsPerRow, itemHeight);
|
||||
ImGuiClip.ClippedDraw(this.valueRange!, this.DrawIcon, itemsPerRow, itemHeight);
|
||||
}
|
||||
}
|
||||
|
||||
ImGui.EndChild();
|
||||
|
||||
this.ProcessMouseDragging();
|
||||
}
|
||||
}
|
||||
|
|
@ -118,16 +120,16 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
{
|
||||
ImGui.Columns(2);
|
||||
|
||||
ImGui.PushItemWidth(ImGui.GetContentRegionAvail().X);
|
||||
if (ImGui.InputInt("##StartRange"u8, ref this.startRange, 0, 0))
|
||||
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
|
||||
if (ImGui.InputInt("##StartRange"u8, ref this.startRange))
|
||||
{
|
||||
this.startRange = Math.Clamp(this.startRange, 0, MaxIconId);
|
||||
this.valueRange = null;
|
||||
}
|
||||
|
||||
ImGui.NextColumn();
|
||||
ImGui.PushItemWidth(ImGui.GetContentRegionAvail().X);
|
||||
if (ImGui.InputInt("##StopRange"u8, ref this.stopRange, 0, 0))
|
||||
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
|
||||
if (ImGui.InputInt("##StopRange"u8, ref this.stopRange))
|
||||
{
|
||||
this.stopRange = Math.Clamp(this.stopRange, 0, MaxIconId);
|
||||
this.valueRange = null;
|
||||
|
|
@ -151,6 +153,10 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
var texm = Service<TextureManager>.Get();
|
||||
var cursor = ImGui.GetCursorScreenPos();
|
||||
|
||||
var white = ImGui.GetColorU32(ImGuiColors.DalamudWhite);
|
||||
var red = ImGui.GetColorU32(ImGuiColors.DalamudRed);
|
||||
var drawList = ImGui.GetWindowDrawList();
|
||||
|
||||
if (texm.Shared.GetFromGameIcon(iconId).TryGetWrap(out var texture, out var exc))
|
||||
{
|
||||
ImGui.Image(texture.Handle, this.iconSize);
|
||||
|
|
@ -158,21 +164,17 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
// If we have the option to show a tooltip image, draw the image, but make sure it's not too big.
|
||||
if (ImGui.IsItemHovered() && this.showTooltipImage)
|
||||
{
|
||||
ImGui.BeginTooltip();
|
||||
using var tooltip = ImRaii.Tooltip();
|
||||
|
||||
var scale = GetImageScaleFactor(texture);
|
||||
|
||||
var textSize = ImGui.CalcTextSize(iconId.ToString());
|
||||
ImGui.SetCursorPosX(
|
||||
texture.Size.X * scale / 2.0f - textSize.X / 2.0f + ImGui.GetStyle().FramePadding.X * 2.0f);
|
||||
ImGui.SetCursorPosX((texture.Size.X * scale / 2.0f - (textSize.X / 2.0f)) + (ImGui.GetStyle().FramePadding.X * 2.0f));
|
||||
ImGui.Text(iconId.ToString());
|
||||
|
||||
ImGui.Image(texture.Handle, texture.Size * scale);
|
||||
ImGui.EndTooltip();
|
||||
}
|
||||
|
||||
// else, just draw the iconId.
|
||||
else if (ImGui.IsItemHovered())
|
||||
else if (ImGui.IsItemHovered()) // else, just draw the iconId.
|
||||
{
|
||||
ImGui.SetTooltip(iconId.ToString());
|
||||
}
|
||||
|
|
@ -185,10 +187,7 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
Task.FromResult(texture.CreateWrapSharingLowLevelResource()));
|
||||
}
|
||||
|
||||
ImGui.GetWindowDrawList().AddRect(
|
||||
cursor,
|
||||
cursor + this.iconSize,
|
||||
ImGui.GetColorU32(ImGuiColors.DalamudWhite));
|
||||
drawList.AddRect(cursor, cursor + this.iconSize, white);
|
||||
}
|
||||
else if (exc is not null)
|
||||
{
|
||||
|
|
@ -197,19 +196,13 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
{
|
||||
var iconText = FontAwesomeIcon.Ban.ToIconString();
|
||||
var textSize = ImGui.CalcTextSize(iconText);
|
||||
ImGui.GetWindowDrawList().AddText(
|
||||
cursor + ((this.iconSize - textSize) / 2),
|
||||
ImGui.GetColorU32(ImGuiColors.DalamudRed),
|
||||
iconText);
|
||||
drawList.AddText(cursor + ((this.iconSize - textSize) / 2), red, iconText);
|
||||
}
|
||||
|
||||
if (ImGui.IsItemHovered())
|
||||
ImGui.SetTooltip($"{iconId}\n{exc}");
|
||||
|
||||
ImGui.GetWindowDrawList().AddRect(
|
||||
cursor,
|
||||
cursor + this.iconSize,
|
||||
ImGui.GetColorU32(ImGuiColors.DalamudRed));
|
||||
drawList.AddRect(cursor, cursor + this.iconSize, red);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -218,18 +211,12 @@ public class IconBrowserWidget : IDataWindowWidget
|
|||
|
||||
ImGui.Dummy(this.iconSize);
|
||||
var textSize = ImGui.CalcTextSize(text);
|
||||
ImGui.GetWindowDrawList().AddText(
|
||||
cursor + ((this.iconSize - textSize) / 2),
|
||||
color,
|
||||
text);
|
||||
drawList.AddText(cursor + ((this.iconSize - textSize) / 2), color, text);
|
||||
|
||||
if (ImGui.IsItemHovered())
|
||||
ImGui.SetTooltip(iconId.ToString());
|
||||
|
||||
ImGui.GetWindowDrawList().AddRect(
|
||||
cursor,
|
||||
cursor + this.iconSize,
|
||||
color);
|
||||
drawList.AddRect(cursor, cursor + this.iconSize, color);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,7 @@ internal class ImGuiWidget : IDataWindowWidget
|
|||
|
||||
ImGui.Separator();
|
||||
|
||||
ImGui.Text(
|
||||
$"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
|
||||
ImGui.Text($"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
|
||||
|
||||
ImGui.Separator();
|
||||
|
||||
|
|
@ -79,45 +78,24 @@ internal class ImGuiWidget : IDataWindowWidget
|
|||
switch (this.notificationTemplate.IconInt)
|
||||
{
|
||||
case 1 or 2:
|
||||
ImGui.InputText(
|
||||
"Icon Text##iconText"u8,
|
||||
ref this.notificationTemplate.IconText,
|
||||
255);
|
||||
ImGui.InputText("Icon Text##iconText"u8, ref this.notificationTemplate.IconText, 255);
|
||||
break;
|
||||
case 5 or 6:
|
||||
ImGui.Combo(
|
||||
"Asset##iconAssetCombo",
|
||||
ref this.notificationTemplate.IconAssetInt,
|
||||
NotificationTemplate.AssetSources);
|
||||
ImGui.Combo("Asset##iconAssetCombo", ref this.notificationTemplate.IconAssetInt, NotificationTemplate.AssetSources);
|
||||
break;
|
||||
case 3 or 7:
|
||||
ImGui.InputText(
|
||||
"Game Path##iconText"u8,
|
||||
ref this.notificationTemplate.IconText,
|
||||
255);
|
||||
ImGui.InputText("Game Path##iconText"u8, ref this.notificationTemplate.IconText, 255);
|
||||
break;
|
||||
case 4 or 8:
|
||||
ImGui.InputText(
|
||||
"File Path##iconText"u8,
|
||||
ref this.notificationTemplate.IconText,
|
||||
255);
|
||||
ImGui.InputText("File Path##iconText"u8, ref this.notificationTemplate.IconText, 255);
|
||||
break;
|
||||
}
|
||||
|
||||
ImGui.Combo(
|
||||
"Initial Duration",
|
||||
ref this.notificationTemplate.InitialDurationInt,
|
||||
NotificationTemplate.InitialDurationTitles);
|
||||
ImGui.Combo("Initial Duration", ref this.notificationTemplate.InitialDurationInt, NotificationTemplate.InitialDurationTitles);
|
||||
|
||||
ImGui.Combo(
|
||||
"Extension Duration",
|
||||
ref this.notificationTemplate.HoverExtendDurationInt,
|
||||
NotificationTemplate.HoverExtendDurationTitles);
|
||||
ImGui.Combo("Extension Duration", ref this.notificationTemplate.HoverExtendDurationInt, NotificationTemplate.HoverExtendDurationTitles);
|
||||
|
||||
ImGui.Combo(
|
||||
"Progress",
|
||||
ref this.notificationTemplate.ProgressMode,
|
||||
NotificationTemplate.ProgressModeTitles);
|
||||
ImGui.Combo("Progress", ref this.notificationTemplate.ProgressMode, NotificationTemplate.ProgressModeTitles);
|
||||
|
||||
ImGui.Checkbox("Respect UI Hidden"u8, ref this.notificationTemplate.RespectUiHidden);
|
||||
|
||||
|
|
@ -127,14 +105,11 @@ internal class ImGuiWidget : IDataWindowWidget
|
|||
|
||||
ImGui.Checkbox("User Dismissable"u8, ref this.notificationTemplate.UserDismissable);
|
||||
|
||||
ImGui.Checkbox(
|
||||
"Action Bar (always on if not user dismissable for the example)"u8,
|
||||
ref this.notificationTemplate.ActionBar);
|
||||
ImGui.Checkbox("Action Bar (always on if not user dismissable for the example)"u8, ref this.notificationTemplate.ActionBar);
|
||||
|
||||
if (ImGui.Button("Add notification"u8))
|
||||
{
|
||||
var text =
|
||||
"Bla bla bla bla bla bla bla bla bla bla bla.\nBla bla bla bla bla bla bla bla bla bla bla bla bla bla.";
|
||||
var text = "Bla bla bla bla bla bla bla bla bla bla bla.\nBla bla bla bla bla bla bla bla bla bla bla bla bla bla.";
|
||||
|
||||
NewRandom(out var title, out var type, out var progress);
|
||||
if (this.notificationTemplate.ManualTitle)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class InventoryWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders |
|
||||
ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoSavedSettings;
|
||||
|
||||
private const ImGuiTableFlags InnerTableFlags = ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings;
|
||||
|
||||
private DataManager dataManager;
|
||||
private TextureManager textureManager;
|
||||
private GameInventoryType? selectedInventoryType = GameInventoryType.Inventory1;
|
||||
|
|
@ -64,7 +69,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
|
||||
private unsafe void DrawInventoryTypeList()
|
||||
{
|
||||
using var table = ImRaii.Table("InventoryTypeTable"u8, 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders | ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoSavedSettings, new Vector2(300, -1));
|
||||
using var table = ImRaii.Table("InventoryTypeTable"u8, 2, TableFlags, new Vector2(300, -1));
|
||||
if (!table) return;
|
||||
|
||||
ImGui.TableSetupColumn("Type"u8);
|
||||
|
|
@ -107,7 +112,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
}
|
||||
}
|
||||
|
||||
private unsafe void DrawInventoryType(GameInventoryType inventoryType)
|
||||
private void DrawInventoryType(GameInventoryType inventoryType)
|
||||
{
|
||||
var items = GameInventoryItem.GetReadOnlySpanOfInventory(inventoryType);
|
||||
if (items.IsEmpty)
|
||||
|
|
@ -116,8 +121,9 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
return;
|
||||
}
|
||||
|
||||
using var itemTable = ImRaii.Table("InventoryItemTable"u8, 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders | ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoSavedSettings);
|
||||
using var itemTable = ImRaii.Table("InventoryItemTable"u8, 4, TableFlags);
|
||||
if (!itemTable) return;
|
||||
|
||||
ImGui.TableSetupColumn("Slot"u8, ImGuiTableColumnFlags.WidthFixed, 40);
|
||||
ImGui.TableSetupColumn("ItemId"u8, ImGuiTableColumnFlags.WidthFixed, 70);
|
||||
ImGui.TableSetupColumn("Quantity"u8, ImGuiTableColumnFlags.WidthFixed, 70);
|
||||
|
|
@ -129,7 +135,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
{
|
||||
var item = items[slotIndex];
|
||||
|
||||
using var disableditem = ImRaii.Disabled(item.ItemId == 0);
|
||||
using var disabledItem = ImRaii.Disabled(item.ItemId == 0);
|
||||
|
||||
ImGui.TableNextRow();
|
||||
ImGui.TableNextColumn(); // Slot
|
||||
|
|
@ -154,11 +160,11 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
if (ImGui.IsItemHovered())
|
||||
{
|
||||
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
|
||||
ImGui.BeginTooltip();
|
||||
|
||||
using var tooltip = ImRaii.Tooltip();
|
||||
ImGui.Text("Click to copy IconId"u8);
|
||||
ImGui.Text($"ID: {iconId} – Size: {texture.Width}x{texture.Height}");
|
||||
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
|
||||
ImGui.EndTooltip();
|
||||
}
|
||||
|
||||
if (ImGui.IsItemClicked())
|
||||
|
|
@ -169,7 +175,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
|
||||
using var itemNameColor = ImRaii.PushColor(ImGuiCol.Text, this.GetItemRarityColor(item.ItemId));
|
||||
using var node = ImRaii.TreeNode($"{itemName}###{inventoryType}_{slotIndex}", ImGuiTreeNodeFlags.SpanAvailWidth);
|
||||
itemNameColor.Dispose();
|
||||
itemNameColor.Pop();
|
||||
|
||||
using (var contextMenu = ImRaii.ContextPopupItem($"{inventoryType}_{slotIndex}_ContextMenu"))
|
||||
{
|
||||
|
|
@ -184,7 +190,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
|
||||
if (!node) continue;
|
||||
|
||||
using var itemInfoTable = ImRaii.Table($"{inventoryType}_{slotIndex}_Table", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings);
|
||||
using var itemInfoTable = ImRaii.Table($"{inventoryType}_{slotIndex}_Table", 2, InnerTableFlags);
|
||||
if (!itemInfoTable) continue;
|
||||
|
||||
ImGui.TableSetupColumn("Name"u8, ImGuiTableColumnFlags.WidthFixed, 150);
|
||||
|
|
@ -266,7 +272,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
ImGui.Text("Stains"u8);
|
||||
ImGui.TableNextColumn();
|
||||
|
||||
using var stainTable = ImRaii.Table($"{inventoryType}_{slotIndex}_StainTable", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings);
|
||||
using var stainTable = ImRaii.Table($"{inventoryType}_{slotIndex}_StainTable", 2, InnerTableFlags);
|
||||
if (!stainTable) continue;
|
||||
|
||||
ImGui.TableSetupColumn("Stain Id"u8, ImGuiTableColumnFlags.WidthFixed, 80);
|
||||
|
|
@ -287,7 +293,7 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
ImGui.Text("Materia"u8);
|
||||
ImGui.TableNextColumn();
|
||||
|
||||
using var materiaTable = ImRaii.Table($"{inventoryType}_{slotIndex}_MateriaTable", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings);
|
||||
using var materiaTable = ImRaii.Table($"{inventoryType}_{slotIndex}_MateriaTable", 2, InnerTableFlags);
|
||||
if (!materiaTable) continue;
|
||||
|
||||
ImGui.TableSetupColumn("Materia Id"u8, ImGuiTableColumnFlags.WidthFixed, 80);
|
||||
|
|
@ -313,10 +319,12 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
|
||||
private uint GetItemRarityColor(uint itemId, bool isEdgeColor = false)
|
||||
{
|
||||
if (ItemUtil.IsEventItem(itemId))
|
||||
var normalized = ItemUtil.GetBaseId(itemId);
|
||||
|
||||
if (normalized.Kind == ItemKind.EventItem)
|
||||
return isEdgeColor ? 0xFF000000 : 0xFFFFFFFF;
|
||||
|
||||
if (!this.dataManager.Excel.GetSheet<Item>().TryGetRow(ItemUtil.GetBaseId(itemId).ItemId, out var item))
|
||||
if (!this.dataManager.Excel.GetSheet<Item>().TryGetRow(normalized.ItemId, out var item))
|
||||
return isEdgeColor ? 0xFF000000 : 0xFFFFFFFF;
|
||||
|
||||
var rowId = ItemUtil.GetItemRarityColorType(item.RowId, isEdgeColor);
|
||||
|
|
@ -327,18 +335,12 @@ internal class InventoryWidget : IDataWindowWidget
|
|||
|
||||
private uint GetItemIconId(uint itemId)
|
||||
{
|
||||
var normalized = ItemUtil.GetBaseId(itemId);
|
||||
|
||||
// EventItem
|
||||
if (ItemUtil.IsEventItem(itemId))
|
||||
if (normalized.Kind == ItemKind.EventItem)
|
||||
return this.dataManager.Excel.GetSheet<EventItem>().TryGetRow(itemId, out var eventItem) ? eventItem.Icon : 0u;
|
||||
|
||||
// HighQuality
|
||||
if (ItemUtil.IsHighQuality(itemId))
|
||||
itemId -= 1_000_000;
|
||||
|
||||
// Collectible
|
||||
if (ItemUtil.IsCollectible(itemId))
|
||||
itemId -= 500_000;
|
||||
|
||||
return this.dataManager.Excel.GetSheet<Item>().TryGetRow(itemId, out var item) ? item.Icon : 0u;
|
||||
return this.dataManager.Excel.GetSheet<Item>().TryGetRow(normalized.ItemId, out var item) ? item.Icon : 0u;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game.ClientState.Keys;
|
||||
using Dalamud.Interface.Colors;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
|
||||
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
||||
|
||||
|
|
@ -29,6 +30,7 @@ internal class KeyStateWidget : IDataWindowWidget
|
|||
{
|
||||
var keyState = Service<KeyState>.Get();
|
||||
|
||||
// TODO: Use table instead of columns
|
||||
ImGui.Columns(4);
|
||||
|
||||
var i = 0;
|
||||
|
|
@ -37,11 +39,10 @@ internal class KeyStateWidget : IDataWindowWidget
|
|||
var code = (int)vkCode;
|
||||
var value = keyState[code];
|
||||
|
||||
ImGui.PushStyleColor(ImGuiCol.Text, value ? ImGuiColors.HealerGreen : ImGuiColors.DPSRed);
|
||||
|
||||
ImGui.Text($"{vkCode} ({code})");
|
||||
|
||||
ImGui.PopStyleColor();
|
||||
using (ImRaii.PushColor(ImGuiCol.Text, value ? ImGuiColors.HealerGreen : ImGuiColors.DPSRed))
|
||||
{
|
||||
ImGui.Text($"{vkCode} ({code})");
|
||||
}
|
||||
|
||||
i++;
|
||||
if (i % 24 == 0)
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class MarketBoardWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg;
|
||||
|
||||
private readonly ConcurrentQueue<(IMarketBoardHistory MarketBoardHistory, IMarketBoardHistoryListing Listing)> marketBoardHistoryQueue = new();
|
||||
private readonly ConcurrentQueue<(IMarketBoardCurrentOfferings MarketBoardCurrentOfferings, IMarketBoardItemListing Listing)> marketBoardCurrentOfferingsQueue = new();
|
||||
private readonly ConcurrentQueue<IMarketBoardPurchase> marketBoardPurchasesQueue = new();
|
||||
|
|
@ -99,49 +101,47 @@ internal class MarketBoardWidget : IDataWindowWidget
|
|||
this.marketBoardHistoryQueue.Clear();
|
||||
}
|
||||
|
||||
using (var tabBar = ImRaii.TabBar("marketTabs"u8))
|
||||
using var tabBar = ImRaii.TabBar("marketTabs"u8);
|
||||
if (!tabBar.Success)
|
||||
return;
|
||||
|
||||
using (var tabItem = ImRaii.TabItem("History"u8))
|
||||
{
|
||||
if (tabBar)
|
||||
if (tabItem)
|
||||
{
|
||||
using (var tabItem = ImRaii.TabItem("History"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable(string.Empty, this.marketBoardHistoryQueue, this.DrawMarketBoardHistory, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity", "Is HQ?", "Sale Price", "Buyer Name", "Purchase Time");
|
||||
}
|
||||
}
|
||||
ImGuiTable.DrawTable("history-table", this.marketBoardHistoryQueue, this.DrawMarketBoardHistory, TableFlags, "Item ID", "Quantity", "Is HQ?", "Sale Price", "Buyer Name", "Purchase Time");
|
||||
}
|
||||
}
|
||||
|
||||
using (var tabItem = ImRaii.TabItem("Offerings"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable(string.Empty, this.marketBoardCurrentOfferingsQueue, this.DrawMarketBoardCurrentOfferings, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity", "Is HQ?", "Price Per Unit", "Retainer Name");
|
||||
}
|
||||
}
|
||||
using (var tabItem = ImRaii.TabItem("Offerings"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable("offerings-table", this.marketBoardCurrentOfferingsQueue, this.DrawMarketBoardCurrentOfferings, TableFlags, "Item ID", "Quantity", "Is HQ?", "Price Per Unit", "Retainer Name");
|
||||
}
|
||||
}
|
||||
|
||||
using (var tabItem = ImRaii.TabItem("Purchases"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable(string.Empty, this.marketBoardPurchasesQueue, this.DrawMarketBoardPurchases, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity");
|
||||
}
|
||||
}
|
||||
using (var tabItem = ImRaii.TabItem("Purchases"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable("purchases-table", this.marketBoardPurchasesQueue, this.DrawMarketBoardPurchases, TableFlags, "Item ID", "Quantity");
|
||||
}
|
||||
}
|
||||
|
||||
using (var tabItem = ImRaii.TabItem("Purchase Requests"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable(string.Empty, this.marketBoardPurchaseRequestsQueue, this.DrawMarketBoardPurchaseRequests, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Is HQ?", "Quantity", "Price Per Unit", "Total Tax", "City ID", "Listing ID", "Retainer ID");
|
||||
}
|
||||
}
|
||||
using (var tabItem = ImRaii.TabItem("Purchase Requests"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable("requests-table", this.marketBoardPurchaseRequestsQueue, this.DrawMarketBoardPurchaseRequests, TableFlags, "Item ID", "Is HQ?", "Quantity", "Price Per Unit", "Total Tax", "City ID", "Listing ID", "Retainer ID");
|
||||
}
|
||||
}
|
||||
|
||||
using (var tabItem = ImRaii.TabItem("Taxes"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable(string.Empty, this.marketTaxRatesQueue, this.DrawMarketTaxRates, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Uldah", "Limsa Lominsa", "Gridania", "Ishgard", "Kugane", "Crystarium", "Sharlayan", "Tuliyollal", "Valid Until");
|
||||
}
|
||||
}
|
||||
using (var tabItem = ImRaii.TabItem("Taxes"u8))
|
||||
{
|
||||
if (tabItem)
|
||||
{
|
||||
ImGuiTable.DrawTable("taxes-table", this.marketTaxRatesQueue, this.DrawMarketTaxRates, TableFlags, "Uldah", "Limsa Lominsa", "Gridania", "Ishgard", "Kugane", "Crystarium", "Sharlayan", "Tuliyollal", "Valid Until");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ internal class NetworkMonitorWidget : IDataWindowWidget
|
|||
private readonly record struct NetworkPacketData(ushort OpCode, NetworkMessageDirection Direction, uint SourceActorId, uint TargetActorId)
|
||||
#pragma warning restore SA1313
|
||||
{
|
||||
public readonly IReadOnlyList<byte> Data = Array.Empty<byte>();
|
||||
public readonly IReadOnlyList<byte> Data = [];
|
||||
|
||||
public NetworkPacketData(NetworkMonitorWidget widget, ushort opCode, NetworkMessageDirection direction, uint sourceActorId, uint targetActorId, nint dataPtr)
|
||||
: this(opCode, direction, sourceActorId, targetActorId)
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ internal class NounProcessorWidget : IDataWindowWidget
|
|||
private ClientLanguage[] languages = [];
|
||||
private string[] languageNames = [];
|
||||
|
||||
private int selectedSheetNameIndex = 0;
|
||||
private int selectedLanguageIndex = 0;
|
||||
private int selectedSheetNameIndex;
|
||||
private int selectedLanguageIndex;
|
||||
private int rowId = 1;
|
||||
private int amount = 1;
|
||||
|
||||
|
|
@ -84,7 +84,6 @@ internal class NounProcessorWidget : IDataWindowWidget
|
|||
{
|
||||
var nounProcessor = Service<NounProcessor>.Get();
|
||||
var dataManager = Service<DataManager>.Get();
|
||||
var clientState = Service<ClientState>.Get();
|
||||
|
||||
var sheetType = NounSheets.ElementAt(this.selectedSheetNameIndex);
|
||||
var language = this.languages[this.selectedLanguageIndex];
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
|
|||
/// </summary>
|
||||
internal class ObjectTableWidget : IDataWindowWidget
|
||||
{
|
||||
private const ImGuiWindowFlags CharacterWindowFlags = ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.AlwaysAutoResize |
|
||||
ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoMove |
|
||||
ImGuiWindowFlags.NoMouseInputs | ImGuiWindowFlags.NoDocking |
|
||||
ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNav;
|
||||
|
||||
private bool resolveGameData;
|
||||
private bool drawCharacters;
|
||||
private float maxCharaDrawDistance = 20.0f;
|
||||
|
|
@ -49,74 +54,66 @@ internal class ObjectTableWidget : IDataWindowWidget
|
|||
if (objectTable.LocalPlayer == null)
|
||||
{
|
||||
ImGui.Text("LocalPlayer null."u8);
|
||||
return;
|
||||
}
|
||||
else if (clientState.IsPvPExcludingDen)
|
||||
|
||||
if (clientState.IsPvPExcludingDen)
|
||||
{
|
||||
ImGui.Text("Cannot access object table while in PvP."u8);
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
||||
stateString += $"ObjectTableLen: {objectTable.Length}\n";
|
||||
stateString += $"LocalPlayerName: {playerState.CharacterName}\n";
|
||||
stateString += $"CurrentWorldName: {(this.resolveGameData ? playerState.CurrentWorld.ValueNullable?.Name : playerState.CurrentWorld.RowId.ToString())}\n";
|
||||
stateString += $"HomeWorldName: {(this.resolveGameData ? playerState.HomeWorld.ValueNullable?.Name : playerState.HomeWorld.RowId.ToString())}\n";
|
||||
stateString += $"LocalCID: {playerState.ContentId:X}\n";
|
||||
stateString += $"LastLinkedItem: {chatGui.LastLinkedItemId}\n";
|
||||
stateString += $"TerritoryType: {clientState.TerritoryType}\n\n";
|
||||
|
||||
ImGui.Text(stateString);
|
||||
|
||||
ImGui.Checkbox("Draw characters on screen"u8, ref this.drawCharacters);
|
||||
ImGui.SliderFloat("Draw Distance"u8, ref this.maxCharaDrawDistance, 2f, 40f);
|
||||
|
||||
for (var i = 0; i < objectTable.Length; i++)
|
||||
{
|
||||
stateString += $"ObjectTableLen: {objectTable.Length}\n";
|
||||
stateString += $"LocalPlayerName: {playerState.CharacterName}\n";
|
||||
stateString += $"CurrentWorldName: {(this.resolveGameData ? playerState.CurrentWorld.ValueNullable?.Name : playerState.CurrentWorld.RowId.ToString())}\n";
|
||||
stateString += $"HomeWorldName: {(this.resolveGameData ? playerState.HomeWorld.ValueNullable?.Name : playerState.HomeWorld.RowId.ToString())}\n";
|
||||
stateString += $"LocalCID: {playerState.ContentId:X}\n";
|
||||
stateString += $"LastLinkedItem: {chatGui.LastLinkedItemId}\n";
|
||||
stateString += $"TerritoryType: {clientState.TerritoryType}\n\n";
|
||||
var obj = objectTable[i];
|
||||
|
||||
ImGui.Text(stateString);
|
||||
if (obj == null)
|
||||
continue;
|
||||
|
||||
ImGui.Checkbox("Draw characters on screen"u8, ref this.drawCharacters);
|
||||
ImGui.SliderFloat("Draw Distance"u8, ref this.maxCharaDrawDistance, 2f, 40f);
|
||||
Util.PrintGameObject(obj, i.ToString(), this.resolveGameData);
|
||||
|
||||
for (var i = 0; i < objectTable.Length; i++)
|
||||
if (this.drawCharacters && gameGui.WorldToScreen(obj.Position, out var screenCoords))
|
||||
{
|
||||
var obj = objectTable[i];
|
||||
// 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:X}:{obj.GameObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
|
||||
|
||||
if (obj == null)
|
||||
var screenPos = ImGui.GetMainViewport().Pos;
|
||||
var screenSize = ImGui.GetMainViewport().Size;
|
||||
|
||||
var windowSize = ImGui.CalcTextSize(objectText);
|
||||
|
||||
// Add some extra safety padding
|
||||
windowSize.X += ImGui.GetStyle().WindowPadding.X + 10;
|
||||
windowSize.Y += ImGui.GetStyle().WindowPadding.Y + 10;
|
||||
|
||||
if (screenCoords.X + windowSize.X > screenPos.X + screenSize.X ||
|
||||
screenCoords.Y + windowSize.Y > screenPos.Y + screenSize.Y)
|
||||
continue;
|
||||
|
||||
Util.PrintGameObject(obj, i.ToString(), this.resolveGameData);
|
||||
if (obj.YalmDistanceX > this.maxCharaDrawDistance)
|
||||
continue;
|
||||
|
||||
if (this.drawCharacters && gameGui.WorldToScreen(obj.Position, out var screenCoords))
|
||||
{
|
||||
// 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.GameObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
|
||||
ImGui.SetNextWindowPos(new Vector2(screenCoords.X, screenCoords.Y));
|
||||
ImGui.SetNextWindowBgAlpha(Math.Max(1f - (obj.YalmDistanceX / this.maxCharaDrawDistance), 0.2f));
|
||||
|
||||
var screenPos = ImGui.GetMainViewport().Pos;
|
||||
var screenSize = ImGui.GetMainViewport().Size;
|
||||
|
||||
var windowSize = ImGui.CalcTextSize(objectText);
|
||||
|
||||
// Add some extra safety padding
|
||||
windowSize.X += ImGui.GetStyle().WindowPadding.X + 10;
|
||||
windowSize.Y += ImGui.GetStyle().WindowPadding.Y + 10;
|
||||
|
||||
if (screenCoords.X + windowSize.X > screenPos.X + screenSize.X ||
|
||||
screenCoords.Y + windowSize.Y > screenPos.Y + screenSize.Y)
|
||||
continue;
|
||||
|
||||
if (obj.YalmDistanceX > this.maxCharaDrawDistance)
|
||||
continue;
|
||||
|
||||
ImGui.SetNextWindowPos(new Vector2(screenCoords.X, screenCoords.Y));
|
||||
|
||||
ImGui.SetNextWindowBgAlpha(Math.Max(1f - (obj.YalmDistanceX / this.maxCharaDrawDistance), 0.2f));
|
||||
if (ImGui.Begin(
|
||||
$"Actor{i}##ActorWindow{i}",
|
||||
ImGuiWindowFlags.NoDecoration |
|
||||
ImGuiWindowFlags.AlwaysAutoResize |
|
||||
ImGuiWindowFlags.NoSavedSettings |
|
||||
ImGuiWindowFlags.NoMove |
|
||||
ImGuiWindowFlags.NoMouseInputs |
|
||||
ImGuiWindowFlags.NoDocking |
|
||||
ImGuiWindowFlags.NoFocusOnAppearing |
|
||||
ImGuiWindowFlags.NoNav))
|
||||
ImGui.Text(objectText);
|
||||
ImGui.End();
|
||||
}
|
||||
if (ImGui.Begin($"Actor{i}##ActorWindow{i}", CharacterWindowFlags))
|
||||
ImGui.Text(objectText);
|
||||
ImGui.End();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ internal class PartyListWidget : IDataWindowWidget
|
|||
|
||||
ImGui.Checkbox("Resolve GameData"u8, ref this.resolveGameData);
|
||||
|
||||
ImGui.Text($"GroupManager: {partyList.GroupManagerAddress.ToInt64():X}");
|
||||
ImGui.Text($"GroupList: {partyList.GroupListAddress.ToInt64():X}");
|
||||
ImGui.Text($"AllianceList: {partyList.AllianceListAddress.ToInt64():X}");
|
||||
ImGui.Text($"GroupManager: {partyList.GroupManagerAddress:X}");
|
||||
ImGui.Text($"GroupList: {partyList.GroupListAddress:X}");
|
||||
ImGui.Text($"AllianceList: {partyList.AllianceListAddress:X}");
|
||||
|
||||
ImGui.Text($"{partyList.Length} Members");
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ internal class PartyListWidget : IDataWindowWidget
|
|||
continue;
|
||||
}
|
||||
|
||||
ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject?.GameObjectId}");
|
||||
ImGui.Text($"[{i}] {member.Address:X} - {member.Name} - {member.GameObject?.GameObjectId ?? 0}");
|
||||
if (this.resolveGameData)
|
||||
{
|
||||
var actor = member.GameObject;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,11 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
{
|
||||
private const LinkMacroPayloadType DalamudLinkType = (LinkMacroPayloadType)Payload.EmbeddedInfoType.DalamudLink - 1;
|
||||
|
||||
private const ImGuiTableFlags TableFlags = ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg |
|
||||
ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoSavedSettings;
|
||||
|
||||
private static readonly string[] TextEntryTypeOptions = ["String", "Macro", "Fixed"];
|
||||
|
||||
private readonly Dictionary<MacroCode, string[]> expressionNames = new()
|
||||
{
|
||||
{ MacroCode.SetResetTime, ["Hour", "WeekDay"] },
|
||||
|
|
@ -191,7 +196,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
if (contentWidth != this.lastContentWidth)
|
||||
{
|
||||
var originalWidth = this.lastContentWidth != 0 ? this.lastContentWidth : contentWidth;
|
||||
this.inputsWidth = this.inputsWidth / originalWidth * contentWidth;
|
||||
this.inputsWidth = (this.inputsWidth / originalWidth) * contentWidth;
|
||||
this.lastContentWidth = contentWidth;
|
||||
}
|
||||
|
||||
|
|
@ -258,7 +263,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
using var tab = ImRaii.TabItem("Global Parameters"u8);
|
||||
if (!tab) return;
|
||||
|
||||
using var table = ImRaii.Table("GlobalParametersTable"u8, 5, ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoSavedSettings);
|
||||
using var table = ImRaii.Table("GlobalParametersTable"u8, 5, TableFlags);
|
||||
if (!table) return;
|
||||
|
||||
ImGui.TableSetupColumn("Id"u8, ImGuiTableColumnFlags.WidthFixed, 40);
|
||||
|
|
@ -541,18 +546,16 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
|
||||
ImGui.SameLine();
|
||||
ImGui.SetNextItemWidth(90 * ImGuiHelpers.GlobalScale);
|
||||
using (var dropdown = ImRaii.Combo("##Language"u8, this.language.ToString() ?? "Language..."))
|
||||
using var dropdown = ImRaii.Combo("##Language"u8, this.language.ToString() ?? "Language...");
|
||||
if (dropdown)
|
||||
{
|
||||
if (dropdown)
|
||||
var values = Enum.GetValues<ClientLanguage>().OrderBy(lang => lang.ToString());
|
||||
foreach (var value in values)
|
||||
{
|
||||
var values = Enum.GetValues<ClientLanguage>().OrderBy((ClientLanguage lang) => lang.ToString());
|
||||
foreach (var value in values)
|
||||
if (ImGui.Selectable(Enum.GetName(value), value == this.language))
|
||||
{
|
||||
if (ImGui.Selectable(Enum.GetName(value), value == this.language))
|
||||
{
|
||||
this.language = value;
|
||||
this.UpdateInputString();
|
||||
}
|
||||
this.language = value;
|
||||
this.UpdateInputString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -572,7 +575,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
try
|
||||
{
|
||||
var headerFile = dataManager.GameData.GetFile<ExcelHeaderFile>($"exd/{sheetName}.exh");
|
||||
if (headerFile.Header.Variant != ExcelVariant.Default)
|
||||
if (headerFile == null || headerFile.Header.Variant != ExcelVariant.Default)
|
||||
return false;
|
||||
|
||||
var sheet = dataManager.Excel.GetSheet<RawRow>(Language.English, sheetName);
|
||||
|
|
@ -668,11 +671,10 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
catch (Exception e)
|
||||
{
|
||||
ImGui.Text(e.Message);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private unsafe void DrawInputs()
|
||||
private void DrawInputs()
|
||||
{
|
||||
using var child = ImRaii.Child("Inputs"u8, new Vector2(this.inputsWidth, -1));
|
||||
if (!child) return;
|
||||
|
|
@ -688,8 +690,6 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
|
||||
var arrowUpButtonSize = this.GetIconButtonSize(FontAwesomeIcon.ArrowUp);
|
||||
var arrowDownButtonSize = this.GetIconButtonSize(FontAwesomeIcon.ArrowDown);
|
||||
var trashButtonSize = this.GetIconButtonSize(FontAwesomeIcon.Trash);
|
||||
var terminalButtonSize = this.GetIconButtonSize(FontAwesomeIcon.Terminal);
|
||||
|
||||
var entryToRemove = -1;
|
||||
var entryToMoveUp = -1;
|
||||
|
|
@ -706,7 +706,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
ImGui.TableNextColumn(); // Type
|
||||
var type = (int)entry.Type;
|
||||
ImGui.SetNextItemWidth(-1);
|
||||
if (ImGui.Combo($"##Type{i}", ref type, ["String", "Macro", "Fixed"]))
|
||||
if (ImGui.Combo($"##Type{i}", ref type, TextEntryTypeOptions))
|
||||
{
|
||||
entry.Type = (TextEntryType)type;
|
||||
updateString |= true;
|
||||
|
|
@ -798,7 +798,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
}
|
||||
}
|
||||
|
||||
private unsafe void UpdateInputString(bool resetLocalParameters = true)
|
||||
private void UpdateInputString(bool resetLocalParameters = true)
|
||||
{
|
||||
using var rssb = new RentedSeStringBuilder();
|
||||
|
||||
|
|
@ -1022,14 +1022,14 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
|
||||
if (macroCode is MacroCode.JaNoun or MacroCode.EnNoun or MacroCode.DeNoun or MacroCode.FrNoun && exprIdx == 1)
|
||||
{
|
||||
var language = macroCode switch
|
||||
var macroLanguage = macroCode switch
|
||||
{
|
||||
MacroCode.JaNoun => ClientLanguage.Japanese,
|
||||
MacroCode.DeNoun => ClientLanguage.German,
|
||||
MacroCode.FrNoun => ClientLanguage.French,
|
||||
_ => ClientLanguage.English,
|
||||
};
|
||||
var articleTypeEnumType = language switch
|
||||
var articleTypeEnumType = macroLanguage switch
|
||||
{
|
||||
ClientLanguage.Japanese => typeof(JapaneseArticleType),
|
||||
ClientLanguage.German => typeof(GermanArticleType),
|
||||
|
|
@ -1208,12 +1208,10 @@ internal class SeStringCreatorWidget : IDataWindowWidget
|
|||
if (expressionType == (int)ExpressionType.LocalNumber)
|
||||
{
|
||||
parameters[index] = new SeStringParameter(0);
|
||||
return;
|
||||
}
|
||||
else if (expressionType == (int)ExpressionType.LocalString)
|
||||
{
|
||||
parameters[index] = new SeStringParameter(string.Empty);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,11 +66,10 @@ internal class ServicesWidget : IDataWindowWidget
|
|||
var margin = ImGui.CalcTextSize("W\nW\nW"u8);
|
||||
var rowHeight = cellPad.Y * 3;
|
||||
var width = ImGui.GetContentRegionAvail().X;
|
||||
if (ImGui.BeginChild(
|
||||
"dependency-graph"u8,
|
||||
new(width, (this.dependencyNodes.Count * (rowHeight + margin.Y)) + cellPad.Y),
|
||||
false,
|
||||
ImGuiWindowFlags.HorizontalScrollbar))
|
||||
var childSize = new Vector2(width, (this.dependencyNodes.Count * (rowHeight + margin.Y)) + cellPad.Y);
|
||||
|
||||
using var child = ImRaii.Child("dependency-graph"u8, childSize, false, ImGuiWindowFlags.HorizontalScrollbar);
|
||||
if (child.Success)
|
||||
{
|
||||
const uint rectBaseBorderColor = 0xFFFFFFFF;
|
||||
const uint rectHoverFillColor = 0xFF404040;
|
||||
|
|
@ -118,10 +117,8 @@ internal class ServicesWidget : IDataWindowWidget
|
|||
hoveredNode = node;
|
||||
if (ImGui.IsMouseClicked(ImGuiMouseButton.Left))
|
||||
{
|
||||
if (this.selectedNodes.Contains(node.Type))
|
||||
if (!this.selectedNodes.Add(node.Type))
|
||||
this.selectedNodes.Remove(node.Type);
|
||||
else
|
||||
this.selectedNodes.Add(node.Type);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -195,13 +192,11 @@ internal class ServicesWidget : IDataWindowWidget
|
|||
ImGui.SetTooltip(node.BlockingReason);
|
||||
|
||||
ImGui.SetCursorPos((new Vector2(rc.X, rc.Y) - pos) + ((cellSize - textSize) / 2));
|
||||
ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
|
||||
using var pushedStyle = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
|
||||
ImGui.Text(node.DisplayedName);
|
||||
ImGui.SameLine();
|
||||
ImGui.PushStyleColor(ImGuiCol.Text, node.TypeSuffixColor);
|
||||
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, node.TypeSuffixColor);
|
||||
ImGui.Text(node.TypeSuffix);
|
||||
ImGui.PopStyleVar();
|
||||
ImGui.PopStyleColor();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -233,7 +228,6 @@ internal class ServicesWidget : IDataWindowWidget
|
|||
|
||||
ImGui.SetCursorPos(default);
|
||||
ImGui.Dummy(new(maxRowWidth, this.dependencyNodes.Count * rowHeight));
|
||||
ImGui.EndChild();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue