|
|
@ -5127,8 +5127,8 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag |
|
|
|
ImGuiContext& g = *GImGui; |
|
|
|
const ImGuiStyle& style = g.Style; |
|
|
|
const float square_sz = GetFrameHeight(); |
|
|
|
const float w_full = CalcItemWidth(); |
|
|
|
const char* label_display_end = FindRenderedTextEnd(label); |
|
|
|
float w_full = CalcItemWidth(); |
|
|
|
g.NextItemData.ClearFlags(); |
|
|
|
|
|
|
|
BeginGroup(); |
|
|
@ -5163,7 +5163,8 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag |
|
|
|
const bool hdr = (flags & ImGuiColorEditFlags_HDR) != 0; |
|
|
|
const int components = alpha ? 4 : 3; |
|
|
|
const float w_button = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x); |
|
|
|
const float w_inputs = ImMax(w_full - w_button, 1.0f * components); |
|
|
|
const float w_inputs = ImMax(w_full - w_button, 1.0f); |
|
|
|
w_full = w_inputs + w_button; |
|
|
|
|
|
|
|
// Convert to the formats we need
|
|
|
|
float f[4] = { col[0], col[1], col[2], alpha ? col[3] : 1.0f }; |
|
|
|