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

chore: Consolidate on ImGuiColors (#1585)

Browse source 
Uses ImGuiColors over KnownColor in most places so that themes override things properly.
This commit is contained in:
KazWolfe 2023-12-23 02:25:08 -08:00 • committed by GitHub
parent c0bb3aebc2
commit b558752558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -150,7 +150,7 @@ internal class ConsoleWindow : Window, IDisposable
{ {
const string regexErrorString = "Regex Filter Error"; const string regexErrorString = "Regex Filter Error";
ImGui.SetCursorPosX(ImGui.GetContentRegionMax().X / 2.0f - ImGui.CalcTextSize(regexErrorString).X / 2.0f); ImGui.SetCursorPosX(ImGui.GetContentRegionMax().X / 2.0f - ImGui.CalcTextSize(regexErrorString).X / 2.0f);
ImGui.TextColored(KnownColor.OrangeRed.Vector(), regexErrorString); ImGui.TextColored(ImGuiColors.DalamudRed, regexErrorString);
} }
ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55 * ImGuiHelpers.GlobalScale), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar); ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55 * ImGuiHelpers.GlobalScale), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar);
@ -491,7 +491,7 @@ internal class ConsoleWindow : Window, IDisposable
if (!sourceNames.Any()) if (!sourceNames.Any())
{ {
ImGui.TextColored(KnownColor.OrangeRed.Vector(), "No Results"); ImGui.TextColored(ImGuiColors.DalamudRed, "No Results");
} }
foreach (var selectable in sourceNames) foreach (var selectable in sourceNames)

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

@ -3,6 +3,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using ImGuiNET; using ImGuiNET;
@ -130,7 +131,7 @@ public class AddonLifecycleWidget : IDataWindowWidget
} }
else else
{ {
var color = receiveEventListener.Hook.IsEnabled ? KnownColor.Green.Vector() : KnownColor.OrangeRed.Vector(); var color = receiveEventListener.Hook.IsEnabled ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed;
var text = receiveEventListener.Hook.IsEnabled ? "Enabled" : "Disabled"; var text = receiveEventListener.Hook.IsEnabled ? "Enabled" : "Disabled";
ImGui.TextColored(color, text); ImGui.TextColored(color, text);
} }

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

@ -4,6 +4,7 @@ using System.Linq;
using System.Numerics; using System.Numerics;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Utility; using Dalamud.Utility;
using ImGuiNET; using ImGuiNET;
@ -154,7 +155,7 @@ public class IconBrowserWidget : IDataWindowWidget
this.nullValues.Add(iconId); this.nullValues.Add(iconId);
} }
ImGui.GetWindowDrawList().AddRect(cursor, cursor + this.iconSize, ImGui.GetColorU32(KnownColor.White.Vector())); ImGui.GetWindowDrawList().AddRect(cursor, cursor + this.iconSize, ImGui.GetColorU32(ImGuiColors.DalamudWhite));
} }
catch (Exception) catch (Exception)
{ {