ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use custom GetPinnableReference instead of deferring it to Span (#2345)

Browse source
This commit is contained in:
srkizer 2025-08-07 01:03:50 +09:00 • committed by GitHub
parent 2cd5c5bc68
commit 3e40cad063
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 107 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.ComboAndList.cs
View file

@ -99,7 +99,7 @@ public static unsafe partial class ImGui
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
fixed (int* currentItemPtr = &currentItem) fixed (int* currentItemPtr = &currentItem)
fixed (byte* itemsSeparatedByZerosPtr = itemsSeparatedByZeros.Span) fixed (byte* itemsSeparatedByZerosPtr = itemsSeparatedByZeros)
{ {
var r = ImGuiNative.Combo(labelPtr, currentItemPtr, itemsSeparatedByZerosPtr, popupMaxHeightInItems) != 0; var r = ImGuiNative.Combo(labelPtr, currentItemPtr, itemsSeparatedByZerosPtr, popupMaxHeightInItems) != 0;
label.Dispose(); label.Dispose();

1
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.InputScalar.cs
View file

@ -362,5 +362,4 @@ public static unsafe partial class ImGui
return res; return res;
} }
} }
} }

5
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.Misc.cs
View file

@ -91,6 +91,7 @@ public static unsafe partial class ImGui
public static void AddInputCharacter(ImGuiIOPtr self, char c) => ImGuiNative.AddInputCharacter(self, c); public static void AddInputCharacter(ImGuiIOPtr self, char c) => ImGuiNative.AddInputCharacter(self, c);
public static void AddInputCharacter(ImGuiIOPtr self, Rune c) => ImGuiNative.AddInputCharacter(self, (uint)c.Value); public static void AddInputCharacter(ImGuiIOPtr self, Rune c) => ImGuiNative.AddInputCharacter(self, (uint)c.Value);
public static void AddInputCharacters(ImGuiIOPtr self, ImU8String str) public static void AddInputCharacters(ImGuiIOPtr self, ImU8String str)
{ {
fixed (byte* strPtr = &str.GetPinnableNullTerminatedReference()) fixed (byte* strPtr = &str.GetPinnableNullTerminatedReference())
@ -121,7 +122,7 @@ public static unsafe partial class ImGui
public static uint GetID(ImU8String strId) public static uint GetID(ImU8String strId)
{ {
fixed (byte* strIdPtr = strId.Span) fixed (byte* strIdPtr = strId)
{ {
var r = ImGuiNative.GetID(strIdPtr, strIdPtr + strId.Length); var r = ImGuiNative.GetID(strIdPtr, strIdPtr + strId.Length);
strId.Dispose(); strId.Dispose();
@ -135,7 +136,7 @@ public static unsafe partial class ImGui
public static void PushID(ImU8String strId) public static void PushID(ImU8String strId)
{ {
fixed (byte* strIdPtr = strId.Span) fixed (byte* strIdPtr = strId)
{ {
ImGuiNative.PushID(strIdPtr, strIdPtr + strId.Length); ImGuiNative.PushID(strIdPtr, strIdPtr + strId.Length);
strId.Dispose(); strId.Dispose();

33
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.Text.cs
View file

@ -8,13 +8,15 @@ public static unsafe partial class ImGui
{ {
public static void AddText(ImFontGlyphRangesBuilderPtr self, ImU8String text) public static void AddText(ImFontGlyphRangesBuilderPtr self, ImU8String text)
{ {
fixed (byte* textPtr = text.Span) ImGuiNative.AddText(self.Handle, textPtr, textPtr + text.Length); fixed (byte* textPtr = text)
ImGuiNative.AddText(self.Handle, textPtr, textPtr + text.Length);
text.Dispose(); text.Dispose();
} }
public static void AddText(ImDrawListPtr self, Vector2 pos, uint col, ImU8String text) public static void AddText(ImDrawListPtr self, Vector2 pos, uint col, ImU8String text)
{ {
fixed (byte* textPtr = text.Span) ImGuiNative.AddText(self.Handle, pos, col, textPtr, textPtr + text.Length); fixed (byte* textPtr = text)
ImGuiNative.AddText(self.Handle, pos, col, textPtr, textPtr + text.Length);
text.Dispose(); text.Dispose();
} }
@ -22,7 +24,7 @@ public static unsafe partial class ImGui
ImDrawListPtr self, ImFontPtr font, float fontSize, Vector2 pos, uint col, ImU8String text, float wrapWidth, ImDrawListPtr self, ImFontPtr font, float fontSize, Vector2 pos, uint col, ImU8String text, float wrapWidth,
scoped in Vector4 cpuFineClipRect) scoped in Vector4 cpuFineClipRect)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
fixed (Vector4* cpuFineClipRectPtr = &cpuFineClipRect) fixed (Vector4* cpuFineClipRectPtr = &cpuFineClipRect)
ImGuiNative.AddText( ImGuiNative.AddText(
self.Handle, self.Handle,
@ -41,14 +43,15 @@ public static unsafe partial class ImGui
ImDrawListPtr self, ImFontPtr font, float fontSize, Vector2 pos, uint col, ImU8String text, ImDrawListPtr self, ImFontPtr font, float fontSize, Vector2 pos, uint col, ImU8String text,
float wrapWidth = 0f) float wrapWidth = 0f)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiNative.AddText(self.Handle, font, fontSize, pos, col, textPtr, textPtr + text.Length, wrapWidth, null); ImGuiNative.AddText(self.Handle, font, fontSize, pos, col, textPtr, textPtr + text.Length, wrapWidth, null);
text.Dispose(); text.Dispose();
} }
public static void append(this ImGuiTextBufferPtr self, ImU8String str) public static void append(this ImGuiTextBufferPtr self, ImU8String str)
{ {
fixed (byte* strPtr = str.Span) ImGuiNative.append(self.Handle, strPtr, strPtr + str.Length); fixed (byte* strPtr = str)
ImGuiNative.append(self.Handle, strPtr, strPtr + str.Length);
str.Dispose(); str.Dispose();
} }
@ -60,8 +63,8 @@ public static unsafe partial class ImGui
scoped ref readonly var style = ref g.Style; scoped ref readonly var style = ref g.Style;
var labelSize = CalcTextSize(text.Span); var labelSize = CalcTextSize(text.Span);
var totalSize = new Vector2( var totalSize = new Vector2(
g.FontSize + (labelSize.X > 0.0f ? (labelSize.X + style.FramePadding.X * 2) : 0.0f), g.FontSize + (labelSize.X > 0.0f ? (labelSize.X + style.FramePadding.X * 2) : 0.0f),
labelSize.Y); // Empty text doesn't add padding labelSize.Y); // Empty text doesn't add padding
var pos = window->DC.CursorPos; var pos = window->DC.CursorPos;
pos.Y += window->DC.CurrLineTextBaseOffset; pos.Y += window->DC.CurrLineTextBaseOffset;
ImGuiP.ItemSize(totalSize, 0.0f); ImGuiP.ItemSize(totalSize, 0.0f);
@ -82,7 +85,7 @@ public static unsafe partial class ImGui
ImU8String text, bool hideTextAfterDoubleHash = false, float wrapWidth = -1.0f) ImU8String text, bool hideTextAfterDoubleHash = false, float wrapWidth = -1.0f)
{ {
var @out = Vector2.Zero; var @out = Vector2.Zero;
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiNative.CalcTextSize( ImGuiNative.CalcTextSize(
&@out, &@out,
textPtr, textPtr,
@ -97,7 +100,7 @@ public static unsafe partial class ImGui
ImFontPtr self, float size, float maxWidth, float wrapWidth, ImU8String text, out int remaining) ImFontPtr self, float size, float maxWidth, float wrapWidth, ImU8String text, out int remaining)
{ {
var @out = Vector2.Zero; var @out = Vector2.Zero;
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
{ {
byte* remainingPtr = null; byte* remainingPtr = null;
ImGuiNative.CalcTextSizeA( ImGuiNative.CalcTextSizeA(
@ -119,7 +122,7 @@ public static unsafe partial class ImGui
public static int CalcWordWrapPositionA( public static int CalcWordWrapPositionA(
ImFontPtr font, float scale, ImU8String text, float wrapWidth) ImFontPtr font, float scale, ImU8String text, float wrapWidth)
{ {
fixed (byte* ptr = text.Span) fixed (byte* ptr = text)
{ {
var r = var r =
(int)(ImGuiNative.CalcWordWrapPositionA(font.Handle, scale, ptr, ptr + text.Length, wrapWidth) - ptr); (int)(ImGuiNative.CalcWordWrapPositionA(font.Handle, scale, ptr, ptr + text.Length, wrapWidth) - ptr);
@ -131,7 +134,7 @@ public static unsafe partial class ImGui
public static void InsertChars( public static void InsertChars(
ImGuiInputTextCallbackDataPtr self, int pos, ImU8String text) ImGuiInputTextCallbackDataPtr self, int pos, ImU8String text)
{ {
fixed (byte* ptr = text.Span) fixed (byte* ptr = text)
ImGuiNative.InsertChars(self.Handle, pos, ptr, ptr + text.Length); ImGuiNative.InsertChars(self.Handle, pos, ptr, ptr + text.Length);
text.Dispose(); text.Dispose();
} }
@ -190,7 +193,7 @@ public static unsafe partial class ImGui
{ {
g.LogBuffer.Buf.Resize(0); g.LogBuffer.Buf.Resize(0);
append(&g.Handle->LogBuffer, text.Span); append(&g.Handle->LogBuffer, text.Span);
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.ImFileWrite(textPtr, 1, (ulong)text.Length, g.LogFile); ImGuiPNative.ImFileWrite(textPtr, 1, (ulong)text.Length, g.LogFile);
} }
else else
@ -203,7 +206,7 @@ public static unsafe partial class ImGui
public static void PassFilter(ImGuiTextFilterPtr self, ImU8String text) public static void PassFilter(ImGuiTextFilterPtr self, ImU8String text)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiNative.PassFilter(self.Handle, textPtr, textPtr + text.Length); ImGuiNative.PassFilter(self.Handle, textPtr, textPtr + text.Length);
text.Dispose(); text.Dispose();
} }
@ -212,7 +215,7 @@ public static unsafe partial class ImGui
ImFontPtr self, ImDrawListPtr drawList, float size, Vector2 pos, uint col, Vector4 clipRect, ImFontPtr self, ImDrawListPtr drawList, float size, Vector2 pos, uint col, Vector4 clipRect,
ImU8String text, float wrapWidth = 0.0f, bool cpuFineClip = false) ImU8String text, float wrapWidth = 0.0f, bool cpuFineClip = false)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiNative.RenderText( ImGuiNative.RenderText(
self, self,
drawList, drawList,
@ -237,7 +240,7 @@ public static unsafe partial class ImGui
public static void Text(ImU8String text) public static void Text(ImU8String text)
{ {
fixed (byte* ptr = text.Span) fixed (byte* ptr = text)
ImGuiNative.TextUnformatted(ptr, ptr + text.Length); ImGuiNative.TextUnformatted(ptr, ptr + text.Length);
text.Dispose(); text.Dispose();
} }

76
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.Widgets.cs
View file

@ -27,7 +27,8 @@ public static unsafe partial class ImGui
} }
} }
public static bool BeginChild(ImU8String strId, Vector2 size = default, bool border = false, ImGuiWindowFlags flags = ImGuiWindowFlags.None) public static bool BeginChild(
ImU8String strId, Vector2 size = default, bool border = false, ImGuiWindowFlags flags = ImGuiWindowFlags.None)
{ {
fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference()) fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference())
{ {
@ -37,10 +38,12 @@ public static unsafe partial class ImGui
} }
} }
public static bool BeginChild(uint id, Vector2 size = default, bool border = false, ImGuiWindowFlags flags = ImGuiWindowFlags.None) => public static bool BeginChild(
uint id, Vector2 size = default, bool border = false, ImGuiWindowFlags flags = ImGuiWindowFlags.None) =>
ImGuiNative.BeginChild(id, size, border ? (byte)1 : (byte)0, flags) != 0; ImGuiNative.BeginChild(id, size, border ? (byte)1 : (byte)0, flags) != 0;
public static bool BeginCombo(ImU8String label, ImU8String previewValue, ImGuiComboFlags flags = ImGuiComboFlags.None) public static bool BeginCombo(
ImU8String label, ImU8String previewValue, ImGuiComboFlags flags = ImGuiComboFlags.None)
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
fixed (byte* previewValuePtr = &previewValue.GetPinnableNullTerminatedReference()) fixed (byte* previewValuePtr = &previewValue.GetPinnableNullTerminatedReference())
@ -82,7 +85,8 @@ public static unsafe partial class ImGui
} }
} }
public static bool BeginPopupContextItem(ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault) public static bool BeginPopupContextItem(
ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault)
{ {
fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference()) fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference())
{ {
@ -92,7 +96,8 @@ public static unsafe partial class ImGui
} }
} }
public static bool BeginPopupContextWindow(ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault) public static bool BeginPopupContextWindow(
ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault)
{ {
fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference()) fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference())
{ {
@ -102,7 +107,8 @@ public static unsafe partial class ImGui
} }
} }
public static bool BeginPopupContextVoid(ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault) public static bool BeginPopupContextVoid(
ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault)
{ {
fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference()) fixed (byte* strIdPtr = &strId.GetPinnableNullTerminatedReference())
{ {
@ -280,7 +286,14 @@ public static unsafe partial class ImGui
{ {
fixed (byte* versionPtr = &versionStr.GetPinnableNullTerminatedReference()) fixed (byte* versionPtr = &versionStr.GetPinnableNullTerminatedReference())
{ {
var r = ImGuiNative.DebugCheckVersionAndDataLayout(versionPtr, szIo, szStyle, szVec2, szVec4, szDrawVert, szDrawIdx) != 0; var r = ImGuiNative.DebugCheckVersionAndDataLayout(
versionPtr,
szIo,
szStyle,
szVec2,
szVec4,
szDrawVert,
szDrawIdx) != 0;
versionStr.Dispose(); versionStr.Dispose();
return r; return r;
} }
@ -363,7 +376,7 @@ public static unsafe partial class ImGui
public static void LoadIniSettingsFromMemory(ImU8String iniData) public static void LoadIniSettingsFromMemory(ImU8String iniData)
{ {
fixed (byte* iniDataPtr = iniData.Span) fixed (byte* iniDataPtr = iniData)
ImGuiNative.LoadIniSettingsFromMemory(iniDataPtr, (nuint)iniData.Length); ImGuiNative.LoadIniSettingsFromMemory(iniDataPtr, (nuint)iniData.Length);
iniData.Dispose(); iniData.Dispose();
} }
@ -381,7 +394,11 @@ public static unsafe partial class ImGui
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
fixed (byte* shortcutPtr = &shortcut.GetPinnableNullTerminatedReference()) fixed (byte* shortcutPtr = &shortcut.GetPinnableNullTerminatedReference())
{ {
var r = ImGuiNative.MenuItem(labelPtr, shortcutPtr, selected ? (byte)1 : (byte)0, enabled ? (byte)1 : (byte)0) != 0; var r = ImGuiNative.MenuItem(
labelPtr,
shortcutPtr,
selected ? (byte)1 : (byte)0,
enabled ? (byte)1 : (byte)0) != 0;
label.Dispose(); label.Dispose();
shortcut.Dispose(); shortcut.Dispose();
return r; return r;
@ -416,7 +433,11 @@ public static unsafe partial class ImGui
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
{ {
var r = ImGuiNative.MenuItem(labelPtr, null, selected ? (byte)1 : (byte)0, enabled ? (byte)1 : (byte)0) != 0; var r = ImGuiNative.MenuItem(
labelPtr,
null,
selected ? (byte)1 : (byte)0,
enabled ? (byte)1 : (byte)0) != 0;
label.Dispose(); label.Dispose();
return r; return r;
} }
@ -429,7 +450,8 @@ public static unsafe partial class ImGui
strId.Dispose(); strId.Dispose();
} }
public static void OpenPopup(uint id, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.None) => ImGuiNative.OpenPopup(id, popupFlags); public static void OpenPopup(uint id, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.None) =>
ImGuiNative.OpenPopup(id, popupFlags);
public static void OpenPopupOnItemClick( public static void OpenPopupOnItemClick(
ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault) ImU8String strId, ImGuiPopupFlags popupFlags = ImGuiPopupFlags.MouseButtonDefault)
@ -457,7 +479,7 @@ public static unsafe partial class ImGui
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
{ {
var r = ImGuiNative.RadioButton(labelPtr, active ? (byte)1:(byte)0) != 0; var r = ImGuiNative.RadioButton(labelPtr, active ? (byte)1 : (byte)0) != 0;
label.Dispose(); label.Dispose();
return r; return r;
} }
@ -468,8 +490,8 @@ public static unsafe partial class ImGui
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
{ {
var pressed = ImGuiNative.RadioButton( var pressed = ImGuiNative.RadioButton(
labelPtr, labelPtr,
EqualityComparer<T>.Default.Equals(v, vButton) ? (byte)1 : (byte)0) != 0; EqualityComparer<T>.Default.Equals(v, vButton) ? (byte)1 : (byte)0) != 0;
if (pressed) if (pressed)
v = vButton; v = vButton;
return pressed; return pressed;
@ -483,22 +505,25 @@ public static unsafe partial class ImGui
} }
public static bool Selectable( public static bool Selectable(
ImU8String label, bool selected = false, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None, Vector2 size = default) ImU8String label, bool selected = false, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None,
Vector2 size = default)
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
{ {
var r = ImGuiNative.Selectable(labelPtr, selected ?(byte)1:(byte)0, flags, size)!=0; var r = ImGuiNative.Selectable(labelPtr, selected ? (byte)1 : (byte)0, flags, size) != 0;
label.Dispose(); label.Dispose();
return r; return r;
} }
} }
public static bool Selectable(ImU8String label, ref bool selected, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None, Vector2 size = default) public static bool Selectable(
ImU8String label, ref bool selected, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None,
Vector2 size = default)
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
fixed (bool* selectedPtr = &selected) fixed (bool* selectedPtr = &selected)
{ {
var r = ImGuiNative.Selectable(labelPtr, selectedPtr, flags, size)!=0; var r = ImGuiNative.Selectable(labelPtr, selectedPtr, flags, size) != 0;
label.Dispose(); label.Dispose();
return r; return r;
} }
@ -516,7 +541,7 @@ public static unsafe partial class ImGui
fixed (byte* typePtr = &type.GetPinnableNullTerminatedReference()) fixed (byte* typePtr = &type.GetPinnableNullTerminatedReference())
fixed (byte* dataPtr = data) fixed (byte* dataPtr = data)
{ {
var r = ImGuiNative.SetDragDropPayload(typePtr, dataPtr, (nuint)data.Length, cond)!=0; var r = ImGuiNative.SetDragDropPayload(typePtr, dataPtr, (nuint)data.Length, cond) != 0;
type.Dispose(); type.Dispose();
return r; return r;
} }
@ -529,7 +554,8 @@ public static unsafe partial class ImGui
tabOrDockedWindowLabel.Dispose(); tabOrDockedWindowLabel.Dispose();
} }
public static void SetWindowCollapsed(bool collapsed, ImGuiCond cond = ImGuiCond.None) => ImGuiNative.SetWindowCollapsed(collapsed ? (byte)1 : (byte)0, cond); public static void SetWindowCollapsed(bool collapsed, ImGuiCond cond = ImGuiCond.None) =>
ImGuiNative.SetWindowCollapsed(collapsed ? (byte)1 : (byte)0, cond);
public static void SetWindowCollapsed(ImU8String name, bool collapsed, ImGuiCond cond = ImGuiCond.None) public static void SetWindowCollapsed(ImU8String name, bool collapsed, ImGuiCond cond = ImGuiCond.None)
{ {
@ -547,7 +573,8 @@ public static unsafe partial class ImGui
name.Dispose(); name.Dispose();
} }
public static void SetWindowPos(Vector2 pos, ImGuiCond cond = ImGuiCond.None) => ImGuiNative.SetWindowPos(pos, cond); public static void SetWindowPos(Vector2 pos, ImGuiCond cond = ImGuiCond.None) =>
ImGuiNative.SetWindowPos(pos, cond);
public static void SetWindowPos(ImU8String name, Vector2 pos, ImGuiCond cond = ImGuiCond.None) public static void SetWindowPos(ImU8String name, Vector2 pos, ImGuiCond cond = ImGuiCond.None)
{ {
@ -556,7 +583,8 @@ public static unsafe partial class ImGui
name.Dispose(); name.Dispose();
} }
public static void SetWindowSize(Vector2 size, ImGuiCond cond = ImGuiCond.None) => ImGuiNative.SetWindowSize(size, cond); public static void SetWindowSize(Vector2 size, ImGuiCond cond = ImGuiCond.None) =>
ImGuiNative.SetWindowSize(size, cond);
public static void SetWindowSize(ImU8String name, Vector2 size, ImGuiCond cond = ImGuiCond.None) public static void SetWindowSize(ImU8String name, Vector2 size, ImGuiCond cond = ImGuiCond.None)
{ {
@ -632,7 +660,7 @@ public static unsafe partial class ImGui
{ {
prefix.AppendLiteral(": "); prefix.AppendLiteral(": ");
prefix.AppendFormatted(value); prefix.AppendFormatted(value);
fixed (byte* prefixPtr = prefix.Span) fixed (byte* prefixPtr = prefix)
{ {
ImGuiNative.TextUnformatted(prefixPtr, prefixPtr + prefix.Length); ImGuiNative.TextUnformatted(prefixPtr, prefixPtr + prefix.Length);
prefix.Dispose(); prefix.Dispose();

2
imgui/Dalamud.Bindings.ImGui/Custom/ImGuiInputTextCallbackData.Custom.cs
View file

@ -3,6 +3,7 @@ namespace Dalamud.Bindings.ImGui;
public unsafe partial struct ImGuiInputTextCallbackData public unsafe partial struct ImGuiInputTextCallbackData
{ {
public readonly Span<byte> BufSpan => new(this.Buf, this.BufSize); public readonly Span<byte> BufSpan => new(this.Buf, this.BufSize);
public readonly Span<byte> BufTextSpan => new(this.Buf, this.BufTextLen); public readonly Span<byte> BufTextSpan => new(this.Buf, this.BufTextLen);
public void InsertChars(int pos, ImU8String text) public void InsertChars(int pos, ImU8String text)
@ -15,6 +16,7 @@ public unsafe partial struct ImGuiInputTextCallbackData
public unsafe partial struct ImGuiInputTextCallbackDataPtr public unsafe partial struct ImGuiInputTextCallbackDataPtr
{ {
public readonly Span<byte> BufSpan => this.Handle->BufSpan; public readonly Span<byte> BufSpan => this.Handle->BufSpan;
public readonly Span<byte> BufTextSpan => this.Handle->BufTextSpan; public readonly Span<byte> BufTextSpan => this.Handle->BufTextSpan;
public void InsertChars(int pos, ImU8String text) => ImGui.InsertChars(this, pos, text); public void InsertChars(int pos, ImU8String text) => ImGui.InsertChars(this, pos, text);

2
imgui/Dalamud.Bindings.ImGui/Custom/ImGuiP.Plot.cs
View file

@ -69,7 +69,7 @@ public static unsafe partial class ImGuiP
ImGuiPlotType plotType, ImU8String label, ImGui.GetFloatRefContextDelegate<TContext> valuesGetter, ImGuiPlotType plotType, ImU8String label, ImGui.GetFloatRefContextDelegate<TContext> valuesGetter,
scoped in TContext context, scoped in TContext context,
int valuesCount, int valuesOffset, ImU8String overlayText, float scaleMin, float scaleMax, Vector2 frameSize) int valuesCount, int valuesOffset, ImU8String overlayText, float scaleMin, float scaleMax, Vector2 frameSize)
where TContext: allows ref struct where TContext : allows ref struct
{ {
fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference()) fixed (byte* labelPtr = &label.GetPinnableNullTerminatedReference())
fixed (byte* overlayTextPtr = &overlayText.GetPinnableNullTerminatedReference()) fixed (byte* overlayTextPtr = &overlayText.GetPinnableNullTerminatedReference())

16
imgui/Dalamud.Bindings.ImGui/Custom/ImGuiP.Text.cs
View file

@ -41,7 +41,7 @@ public static unsafe partial class ImGuiP
public static uint GetID(ImGuiWindowPtr self, ImU8String str) public static uint GetID(ImGuiWindowPtr self, ImU8String str)
{ {
fixed (byte* strPtr = str.Span) fixed (byte* strPtr = str)
{ {
var seed = *self.IDStack.Back; var seed = *self.IDStack.Back;
var id = ImGuiPNative.ImHashStr(strPtr, (nuint)str.Length, seed); var id = ImGuiPNative.ImHashStr(strPtr, (nuint)str.Length, seed);
@ -63,7 +63,7 @@ public static unsafe partial class ImGuiP
public static uint ImHashStr(ImU8String data, uint seed = 0) public static uint ImHashStr(ImU8String data, uint seed = 0)
{ {
fixed (byte* ptr = data.Span) fixed (byte* ptr = data)
{ {
var res = ImGuiPNative.ImHashStr(ptr, (nuint)data.Length, seed); var res = ImGuiPNative.ImHashStr(ptr, (nuint)data.Length, seed);
data.Dispose(); data.Dispose();
@ -133,14 +133,14 @@ public static unsafe partial class ImGuiP
public static void LogRenderedText(scoped in Vector2 refPos, ImU8String text) public static void LogRenderedText(scoped in Vector2 refPos, ImU8String text)
{ {
fixed (Vector2* refPosPtr = &refPos) fixed (Vector2* refPosPtr = &refPos)
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.LogRenderedText(refPosPtr, textPtr, textPtr + text.Length); ImGuiPNative.LogRenderedText(refPosPtr, textPtr, textPtr + text.Length);
text.Dispose(); text.Dispose();
} }
public static void RenderText(Vector2 pos, ImU8String text, bool hideTextAfterHash = true) public static void RenderText(Vector2 pos, ImU8String text, bool hideTextAfterHash = true)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.RenderText(pos, textPtr, textPtr + text.Length, hideTextAfterHash ? (byte)1 : (byte)0); ImGuiPNative.RenderText(pos, textPtr, textPtr + text.Length, hideTextAfterHash ? (byte)1 : (byte)0);
text.Dispose(); text.Dispose();
} }
@ -148,7 +148,7 @@ public static unsafe partial class ImGuiP
public static void RenderTextWrapped( public static void RenderTextWrapped(
Vector2 pos, ImU8String text, float wrapWidth) Vector2 pos, ImU8String text, float wrapWidth)
{ {
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.RenderTextWrapped(pos, textPtr, textPtr + text.Length, wrapWidth); ImGuiPNative.RenderTextWrapped(pos, textPtr, textPtr + text.Length, wrapWidth);
text.Dispose(); text.Dispose();
} }
@ -160,7 +160,7 @@ public static unsafe partial class ImGuiP
{ {
var textSizeIfKnownOrDefault = textSizeIfKnown ?? default; var textSizeIfKnownOrDefault = textSizeIfKnown ?? default;
var clipRectOrDefault = clipRect ?? default; var clipRectOrDefault = clipRect ?? default;
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.RenderTextClipped( ImGuiPNative.RenderTextClipped(
posMin, posMin,
posMax, posMax,
@ -179,7 +179,7 @@ public static unsafe partial class ImGuiP
{ {
var textSizeIfKnownOrDefault = textSizeIfKnown ?? default; var textSizeIfKnownOrDefault = textSizeIfKnown ?? default;
var clipRectOrDefault = clipRect ?? default; var clipRectOrDefault = clipRect ?? default;
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.RenderTextClippedEx( ImGuiPNative.RenderTextClippedEx(
drawList.Handle, drawList.Handle,
posMin, posMin,
@ -197,7 +197,7 @@ public static unsafe partial class ImGuiP
ImU8String text, scoped in Vector2? textSizeIfKnown = null) ImU8String text, scoped in Vector2? textSizeIfKnown = null)
{ {
var textSizeIfKnownOrDefault = textSizeIfKnown ?? default; var textSizeIfKnownOrDefault = textSizeIfKnown ?? default;
fixed (byte* textPtr = text.Span) fixed (byte* textPtr = text)
ImGuiPNative.RenderTextEllipsis( ImGuiPNative.RenderTextEllipsis(
drawList.Handle, drawList.Handle,
posMin, posMin,

22
imgui/Dalamud.Bindings.ImGui/ImU8String.cs
View file

@ -169,6 +169,28 @@ public ref struct ImU8String : IDisposable
public static unsafe implicit operator ImU8String(byte* text) => new(text); public static unsafe implicit operator ImU8String(byte* text) => new(text);
public static unsafe implicit operator ImU8String(char* text) => new(text); public static unsafe implicit operator ImU8String(char* text) => new(text);
public ref readonly byte GetPinnableReference()
{
if (this.IsNull)
return ref Unsafe.NullRef<byte>();
if (this.IsEmpty)
return ref this.FixedBufferSpan[0];
return ref this.Span.GetPinnableReference();
}
public ref readonly byte GetPinnableReference(ReadOnlySpan<byte> defaultValue)
{
if (this.IsNull)
return ref defaultValue.GetPinnableReference();
if (this.IsEmpty)
return ref this.FixedBufferSpan[0];
return ref this.Span.GetPinnableReference();
}
public ref readonly byte GetPinnableNullTerminatedReference(ReadOnlySpan<byte> defaultValue = default) public ref readonly byte GetPinnableNullTerminatedReference(ReadOnlySpan<byte> defaultValue = default)
{ {
if (this.IsNull) if (this.IsNull)