From d676473928f91be87de6076c85f3e334c584279d Mon Sep 17 00:00:00 2001
From: kalilistic <35899782+kalilistic@users.noreply.github.com>
Date: Wed, 20 Apr 2022 03:42:10 -0400
Subject: [PATCH] feat: add missing color overrides (#803)
---
Dalamud/Interface/Colors/ImGuiColors.cs | 18 +++---
Dalamud/Interface/Style/DalamudColors.cs | 72 ++++++++++++++++++++++++
Dalamud/Interface/Style/StyleModelV1.cs | 27 +++++++++
3 files changed, 108 insertions(+), 9 deletions(-)
diff --git a/Dalamud/Interface/Colors/ImGuiColors.cs b/Dalamud/Interface/Colors/ImGuiColors.cs
index a8cb2f6fb..e1a3356fa 100644
--- a/Dalamud/Interface/Colors/ImGuiColors.cs
+++ b/Dalamud/Interface/Colors/ImGuiColors.cs
@@ -45,12 +45,12 @@ namespace Dalamud.Interface.Colors
///
/// Gets yellow used in dalamud.
///
- public static Vector4 DalamudYellow { get; } = new(1f, 1f, .4f, 1f);
+ public static Vector4 DalamudYellow { get; internal set; } = new(1f, 1f, .4f, 1f);
///
/// Gets violet used in dalamud.
///
- public static Vector4 DalamudViolet { get; } = new(0.770f, 0.700f, 0.965f, 1.000f);
+ public static Vector4 DalamudViolet { get; internal set; } = new(0.770f, 0.700f, 0.965f, 1.000f);
///
/// Gets tank blue (UIColor37).
@@ -70,36 +70,36 @@ namespace Dalamud.Interface.Colors
///
/// Gets parsed grey.
///
- public static Vector4 ParsedGrey { get; } = new(0.4f, 0.4f, 0.4f, 1f);
+ public static Vector4 ParsedGrey { get; internal set; } = new(0.4f, 0.4f, 0.4f, 1f);
///
/// Gets parsed green.
///
- public static Vector4 ParsedGreen { get; } = new(0.117f, 1f, 0f, 1f);
+ public static Vector4 ParsedGreen { get; internal set; } = new(0.117f, 1f, 0f, 1f);
///
/// Gets parsed blue.
///
- public static Vector4 ParsedBlue { get; } = new(0f, 0.439f, 1f, 1f);
+ public static Vector4 ParsedBlue { get; internal set; } = new(0f, 0.439f, 1f, 1f);
///
/// Gets parsed purple.
///
- public static Vector4 ParsedPurple { get; } = new(0.639f, 0.207f, 0.933f, 1f);
+ public static Vector4 ParsedPurple { get; internal set; } = new(0.639f, 0.207f, 0.933f, 1f);
///
/// Gets parsed orange.
///
- public static Vector4 ParsedOrange { get; } = new(1f, 0.501f, 0f, 1f);
+ public static Vector4 ParsedOrange { get; internal set; } = new(1f, 0.501f, 0f, 1f);
///
/// Gets parsed pink.
///
- public static Vector4 ParsedPink { get; } = new(0.886f, 0.407f, 0.658f, 1f);
+ public static Vector4 ParsedPink { get; internal set; } = new(0.886f, 0.407f, 0.658f, 1f);
///
/// Gets parsed gold.
///
- public static Vector4 ParsedGold { get; } = new(0.898f, 0.8f, 0.501f, 1f);
+ public static Vector4 ParsedGold { get; internal set; } = new(0.898f, 0.8f, 0.501f, 1f);
}
}
diff --git a/Dalamud/Interface/Style/DalamudColors.cs b/Dalamud/Interface/Style/DalamudColors.cs
index a674ee4b2..e74097936 100644
--- a/Dalamud/Interface/Style/DalamudColors.cs
+++ b/Dalamud/Interface/Style/DalamudColors.cs
@@ -39,6 +39,33 @@ namespace Dalamud.Interface.Style
[JsonProperty("j")]
public Vector4? DPSRed { get; set; }
+ [JsonProperty("k")]
+ public Vector4? DalamudYellow { get; set; }
+
+ [JsonProperty("l")]
+ public Vector4? DalamudViolet { get; set; }
+
+ [JsonProperty("m")]
+ public Vector4? ParsedGrey { get; set; }
+
+ [JsonProperty("n")]
+ public Vector4? ParsedGreen { get; set; }
+
+ [JsonProperty("o")]
+ public Vector4? ParsedBlue { get; set; }
+
+ [JsonProperty("p")]
+ public Vector4? ParsedPurple { get; set; }
+
+ [JsonProperty("q")]
+ public Vector4? ParsedOrange { get; set; }
+
+ [JsonProperty("r")]
+ public Vector4? ParsedPink { get; set; }
+
+ [JsonProperty("s")]
+ public Vector4? ParsedGold { get; set; }
+
public void Apply()
{
if (this.DalamudRed.HasValue)
@@ -90,6 +117,51 @@ namespace Dalamud.Interface.Style
{
ImGuiColors.DPSRed = this.DPSRed.Value;
}
+
+ if (this.DalamudYellow.HasValue)
+ {
+ ImGuiColors.DalamudYellow = this.DalamudYellow.Value;
+ }
+
+ if (this.DalamudViolet.HasValue)
+ {
+ ImGuiColors.DalamudViolet = this.DalamudViolet.Value;
+ }
+
+ if (this.ParsedGrey.HasValue)
+ {
+ ImGuiColors.ParsedGrey = this.ParsedGrey.Value;
+ }
+
+ if (this.ParsedGreen.HasValue)
+ {
+ ImGuiColors.ParsedGreen = this.ParsedGreen.Value;
+ }
+
+ if (this.ParsedBlue.HasValue)
+ {
+ ImGuiColors.ParsedBlue = this.ParsedBlue.Value;
+ }
+
+ if (this.ParsedPurple.HasValue)
+ {
+ ImGuiColors.ParsedPurple = this.ParsedPurple.Value;
+ }
+
+ if (this.ParsedOrange.HasValue)
+ {
+ ImGuiColors.ParsedOrange = this.ParsedOrange.Value;
+ }
+
+ if (this.ParsedPink.HasValue)
+ {
+ ImGuiColors.ParsedPink = this.ParsedPink.Value;
+ }
+
+ if (this.ParsedGold.HasValue)
+ {
+ ImGuiColors.ParsedGold = this.ParsedGold.Value;
+ }
}
}
diff --git a/Dalamud/Interface/Style/StyleModelV1.cs b/Dalamud/Interface/Style/StyleModelV1.cs
index c08c3460c..0d10387c4 100644
--- a/Dalamud/Interface/Style/StyleModelV1.cs
+++ b/Dalamud/Interface/Style/StyleModelV1.cs
@@ -126,9 +126,18 @@ namespace Dalamud.Interface.Style
DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
+ DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
+ DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
+ ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
+ ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
+ ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
+ ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
+ ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
+ ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
+ ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
},
};
@@ -236,9 +245,18 @@ namespace Dalamud.Interface.Style
DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
+ DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
+ DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
+ ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
+ ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
+ ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
+ ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
+ ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
+ ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
+ ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
},
};
@@ -400,9 +418,18 @@ namespace Dalamud.Interface.Style
DalamudWhite = ImGuiColors.DalamudWhite,
DalamudWhite2 = ImGuiColors.DalamudWhite2,
DalamudOrange = ImGuiColors.DalamudOrange,
+ DalamudYellow = ImGuiColors.DalamudYellow,
+ DalamudViolet = ImGuiColors.DalamudViolet,
TankBlue = ImGuiColors.TankBlue,
HealerGreen = ImGuiColors.HealerGreen,
DPSRed = ImGuiColors.DPSRed,
+ ParsedGrey = ImGuiColors.ParsedGrey,
+ ParsedGreen = ImGuiColors.ParsedGreen,
+ ParsedBlue = ImGuiColors.ParsedBlue,
+ ParsedPurple = ImGuiColors.ParsedPurple,
+ ParsedOrange = ImGuiColors.ParsedOrange,
+ ParsedPink = ImGuiColors.ParsedPink,
+ ParsedGold = ImGuiColors.ParsedGold,
};
return model;