ColorPicker / ColorEdit: restore Hue when zeroing Saturation. (#2722, #2770)
Issue is fixed by storing last active color picker color and last hue value when active color picker takes rgb as input. Then if current color picker color matches last active color - hue value will be restored. IDs are not used because ColorEdit4() and ColorWidget4() may call each other in hard-to-predict ways and they both push their own IDs on to the stack. We need hue restoration to happen in entire stack of these widgets if topmost widget used hue restoration. Since these widgets operate on exact same color value - color was chosen as a factor deciding which widgets should restore hue.
diff --git a/imgui_internal.h b/imgui_internal.h
index 47da60a..8fc03a0 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -1012,6 +1012,8 @@
ImFont InputTextPasswordFont;
ImGuiID TempInputTextId; // Temporary text input when CTRL+clicking on a slider, etc.
ImGuiColorEditFlags ColorEditOptions; // Store user options for color edit widgets
+ float ColorEditLastHue;
+ float ColorEditLastActiveColor[3];
ImVec4 ColorPickerRef;
bool DragCurrentAccumDirty;
float DragCurrentAccum; // Accumulator for dragging modification. Always high-precision, not rounded by end-user precision settings
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 3adfc89..7466acf 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -4200,7 +4200,12 @@
if ((flags & ImGuiColorEditFlags_InputHSV) && (flags & ImGuiColorEditFlags_DisplayRGB))
ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]);
else if ((flags & ImGuiColorEditFlags_InputRGB) && (flags & ImGuiColorEditFlags_DisplayHSV))
+ {
ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]);
+ // Hue is lost when converting from greyscale rgb (saturation=0). Restore it.
+ if (f[1] == 0 && memcmp(g.ColorEditLastActiveColor, col, sizeof(float) * 3) == 0)
+ f[0] = g.ColorEditLastHue;
+ }
int i[4] = { IM_F32_TO_INT8_UNBOUND(f[0]), IM_F32_TO_INT8_UNBOUND(f[1]), IM_F32_TO_INT8_UNBOUND(f[2]), IM_F32_TO_INT8_UNBOUND(f[3]) };
bool value_changed = false;
@@ -4327,7 +4332,11 @@
for (int n = 0; n < 4; n++)
f[n] = i[n] / 255.0f;
if ((flags & ImGuiColorEditFlags_DisplayHSV) && (flags & ImGuiColorEditFlags_InputRGB))
+ {
+ g.ColorEditLastHue = f[0];
ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]);
+ memcpy(g.ColorEditLastActiveColor, f, sizeof(float) * 3);
+ }
if ((flags & ImGuiColorEditFlags_DisplayRGB) && (flags & ImGuiColorEditFlags_InputHSV))
ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]);
@@ -4504,7 +4513,12 @@
float H = col[0], S = col[1], V = col[2];
float R = col[0], G = col[1], B = col[2];
if (flags & ImGuiColorEditFlags_InputRGB)
+ {
ColorConvertRGBtoHSV(R, G, B, H, S, V);
+ // Hue is lost when converting from greyscale rgb (saturation=0). Restore it.
+ if (S == 0 && memcmp(g.ColorEditLastActiveColor, col, sizeof(float) * 3) == 0)
+ H = g.ColorEditLastHue;
+ }
else if (flags & ImGuiColorEditFlags_InputHSV)
ColorConvertHSVtoRGB(H, S, V, R, G, B);
@@ -4628,6 +4642,8 @@
if (flags & ImGuiColorEditFlags_InputRGB)
{
ColorConvertHSVtoRGB(H >= 1.0f ? H - 10 * 1e-6f : H, S > 0.0f ? S : 10*1e-6f, V > 0.0f ? V : 1e-6f, col[0], col[1], col[2]);
+ g.ColorEditLastHue = H;
+ memcpy(g.ColorEditLastActiveColor, col, sizeof(float) * 3);
}
else if (flags & ImGuiColorEditFlags_InputHSV)
{
@@ -4680,7 +4696,9 @@
R = col[0];
G = col[1];
B = col[2];
+ float preserve_hue = H;
ColorConvertRGBtoHSV(R, G, B, H, S, V);
+ H = preserve_hue; // Avoids picker losing hue value for 1 frame glitch.
}
else if (flags & ImGuiColorEditFlags_InputHSV)
{
