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

Update text-related ImGui calls (#2337)

Browse source 
* Update text-related ImGui calls

* Use ImU8String for SafeTextColored

* Restore wrapped calls

* Update MenuItem call

* Use ImGui.Text over ImGui.TextUnformatted

* Add ImGui.TextColoredWrapped

* Obsolete SafeText helpers

* Fix obsoleted calls

* SafeTextColored didn't exist before imgui-bindings

* Remove %% replacements
This commit is contained in:
Haselnussbomber 2025-08-05 00:46:43 +02:00 • committed by GitHub
parent f0021bc8f9
commit 58fbff7c56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
126 changed files with 1433 additions and 1406 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@ -49,29 +49,29 @@ internal class ImGuiWidget : IDataWindowWidget
ImGui.Text("Monitor count: " + ImGui.GetPlatformIO().Monitors.Size);
ImGui.Text("OverrideGameCursor: " + interfaceManager.OverrideGameCursor);
ImGui.Button("THIS IS A BUTTON###hoverTestButton");
ImGui.Button("THIS IS A BUTTON###hoverTestButton"u8);
interfaceManager.OverrideGameCursor = !ImGui.IsItemHovered();
ImGui.Separator();
ImGui.TextUnformatted(
ImGui.Text(
$"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
ImGui.Separator();
ImGui.Checkbox("##manualContent", ref this.notificationTemplate.ManualContent);
ImGui.Checkbox("##manualContent"u8, ref this.notificationTemplate.ManualContent);
ImGui.SameLine();
ImGui.InputText("Content##content", ref this.notificationTemplate.Content, 255);
ImGui.InputText("Content##content"u8, ref this.notificationTemplate.Content, 255);
ImGui.Checkbox("##manualTitle", ref this.notificationTemplate.ManualTitle);
ImGui.Checkbox("##manualTitle"u8, ref this.notificationTemplate.ManualTitle);
ImGui.SameLine();
ImGui.InputText("Title##title", ref this.notificationTemplate.Title, 255);
ImGui.InputText("Title##title"u8, ref this.notificationTemplate.Title, 255);
ImGui.Checkbox("##manualMinimizedText", ref this.notificationTemplate.ManualMinimizedText);
ImGui.Checkbox("##manualMinimizedText"u8, ref this.notificationTemplate.ManualMinimizedText);
ImGui.SameLine();
ImGui.InputText("MinimizedText##minimizedText", ref this.notificationTemplate.MinimizedText, 255);
ImGui.InputText("MinimizedText##minimizedText"u8, ref this.notificationTemplate.MinimizedText, 255);
ImGui.Checkbox("##manualType", ref this.notificationTemplate.ManualType);
ImGui.Checkbox("##manualType"u8, ref this.notificationTemplate.ManualType);
ImGui.SameLine();
ImGui.Combo("Type##type", ref this.notificationTemplate.TypeInt, NotificationTemplate.TypeTitles);
@ -80,7 +80,7 @@ internal class ImGuiWidget : IDataWindowWidget
{
case 1 or 2:
ImGui.InputText(
"Icon Text##iconText",
"Icon Text##iconText"u8,
ref this.notificationTemplate.IconText,
255);
break;
@ -92,13 +92,13 @@ internal class ImGuiWidget : IDataWindowWidget
break;
case 3 or 7:
ImGui.InputText(
"Game Path##iconText",
"Game Path##iconText"u8,
ref this.notificationTemplate.IconText,
255);
break;
case 4 or 8:
ImGui.InputText(
"File Path##iconText",
"File Path##iconText"u8,
ref this.notificationTemplate.IconText,
255);
break;
@ -119,19 +119,19 @@ internal class ImGuiWidget : IDataWindowWidget
ref this.notificationTemplate.ProgressMode,
NotificationTemplate.ProgressModeTitles);
ImGui.Checkbox("Respect UI Hidden", ref this.notificationTemplate.RespectUiHidden);
ImGui.Checkbox("Respect UI Hidden"u8, ref this.notificationTemplate.RespectUiHidden);
ImGui.Checkbox("Minimized", ref this.notificationTemplate.Minimized);
ImGui.Checkbox("Minimized"u8, ref this.notificationTemplate.Minimized);
ImGui.Checkbox("Show Indeterminate If No Expiry", ref this.notificationTemplate.ShowIndeterminateIfNoExpiry);
ImGui.Checkbox("Show Indeterminate If No Expiry"u8, ref this.notificationTemplate.ShowIndeterminateIfNoExpiry);
ImGui.Checkbox("User Dismissable", ref this.notificationTemplate.UserDismissable);
ImGui.Checkbox("User Dismissable"u8, ref this.notificationTemplate.UserDismissable);
ImGui.Checkbox(
"Action Bar (always on if not user dismissable for the example)",
"Action Bar (always on if not user dismissable for the example)"u8,
ref this.notificationTemplate.ActionBar);
if (ImGui.Button("Add notification"))
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.";
@ -266,10 +266,10 @@ internal class ImGuiWidget : IDataWindowWidget
n.DrawActions += an =>
{
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted($"{nclick}");
ImGui.Text($"{nclick}");
ImGui.SameLine();
if (ImGui.Button("Update"))
if (ImGui.Button("Update"u8))
{
NewRandom(out title, out type, out progress);
an.Notification.Title = title;
@ -278,18 +278,18 @@ internal class ImGuiWidget : IDataWindowWidget
}
ImGui.SameLine();
if (ImGui.Button("Dismiss"))
if (ImGui.Button("Dismiss"u8))
an.Notification.DismissNow();
ImGui.SameLine();
ImGui.SetNextItemWidth(an.MaxCoord.X - ImGui.GetCursorPosX());
ImGui.InputText("##input", ref testString, 255);
ImGui.InputText("##input"u8, ref testString, 255);
};
}
}
ImGui.SameLine();
if (ImGui.Button("Replace images using setter"))
if (ImGui.Button("Replace images using setter"u8))
{
foreach (var n in this.notifications)
{