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

bump cs, fix warnings

Browse source
This commit is contained in:
Kaz Wolfe 2025-08-04 21:11:06 -07:00
parent d3bd5f1dce
commit ff36f08d0c
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
12 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -518,15 +518,15 @@ internal partial class InterfaceManager : IInternalDisposableService
/// <summary> Safely invoke <seealso cref="DefaultGlobalScaleChanged"/>. </summary>
internal void InvokeGlobalScaleChanged()
=> DefaultGlobalScaleChanged.InvokeSafely();
=> this.DefaultGlobalScaleChanged.InvokeSafely();
/// <summary> Safely invoke <seealso cref="DefaultFontChanged"/>. </summary>
internal void InvokeFontChanged()
=> DefaultFontChanged.InvokeSafely();
=> this.DefaultFontChanged.InvokeSafely();
/// <summary> Safely invoke <seealso cref="DefaultStyleChanged"/>. </summary>
internal void InvokeStyleChanged()
=> DefaultStyleChanged.InvokeSafely();
=> this.DefaultStyleChanged.InvokeSafely();
private static InterfaceManager WhenFontsReady()
{

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

@ -81,11 +81,10 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
var stringArrayData = (StringArrayData*)arrays[arrayIndex];
for (var rowIndex = 0; rowIndex < arrays[arrayIndex]->Size; rowIndex++)
{
var isNull = (nint)stringArrayData->StringArray[rowIndex] == 0;
if (isNull)
if (!stringArrayData->StringArray[rowIndex].HasValue)
continue;
if (new ReadOnlySeStringSpan(stringArrayData->StringArray[rowIndex]).ExtractText().Contains(this.searchTerm, StringComparison.InvariantCultureIgnoreCase))
if (new ReadOnlySeStringSpan(stringArrayData->StringArray[rowIndex].Value).ExtractText().Contains(this.searchTerm, StringComparison.InvariantCultureIgnoreCase))
rowsFound++;
}
@ -289,7 +288,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
for (var i = 0; i < array->Size; i++)
{
var isNull = (nint)array->StringArray[i] == 0;
var isNull = !array->StringArray[i].HasValue;
if (isNull && this.hideUnsetStringArrayEntries)
continue;
@ -298,7 +297,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
if (isNull)
continue;
if (!new ReadOnlySeStringSpan(array->StringArray[i]).ExtractText().Contains(this.searchTerm, StringComparison.InvariantCultureIgnoreCase))
if (!new ReadOnlySeStringSpan(array->StringArray[i].Value).ExtractText().Contains(this.searchTerm, StringComparison.InvariantCultureIgnoreCase))
continue;
}
@ -312,7 +311,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
if (this.showTextAddress)
{
if (!isNull)
WidgetUtil.DrawCopyableText($"0x{(nint)array->StringArray[i]:X}", "Copy text address");
WidgetUtil.DrawCopyableText($"0x{(nint)array->StringArray[i].Value:X}", "Copy text address");
}
else
{
@ -322,7 +321,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
ImGui.TableNextColumn(); // Managed
if (!isNull)
{
ImGui.Text(((nint)array->StringArray[i] != 0 && array->ManagedStringArray[i] == array->StringArray[i]).ToString());
ImGui.Text((array->StringArray[i].HasValue && array->ManagedStringArray[i].Value == array->StringArray[i]).ToString());
}
ImGui.TableNextColumn(); // Text
@ -330,11 +329,11 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
{
if (this.showMacroString)
{
WidgetUtil.DrawCopyableText(new ReadOnlySeStringSpan(array->StringArray[i]).ToString(), "Copy text");
WidgetUtil.DrawCopyableText(new ReadOnlySeStringSpan(array->StringArray[i].Value).ToString(), "Copy text");
}
else
{
ImGuiHelpers.SeStringWrapped(new ReadOnlySeStringSpan(array->StringArray[i]));
ImGuiHelpers.SeStringWrapped(new ReadOnlySeStringSpan(array->StringArray[i].Value));
}
}
}

3
Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs
View file

@ -254,7 +254,8 @@ public class StyleEditorWindow : Window
ImGui.Text("Alignment"u8);
changes |= ImGui.SliderFloat2("WindowTitleAlign", ref style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
var windowMenuButtonPosition = (int)style.WindowMenuButtonPosition + 1;
if (ImGui.Combo("WindowMenuButtonPosition"u8, ref windowMenuButtonPosition, ["None", "Left", "Right"])) {
if (ImGui.Combo("WindowMenuButtonPosition"u8, ref windowMenuButtonPosition, ["None", "Left", "Right"]))
{
style.WindowMenuButtonPosition = (ImGuiDir)(windowMenuButtonPosition - 1);
changes = true;
}