fix highlight colors
This commit is contained in:
parent
3a2c27f22b
commit
cc4c20218e
6
extern/imgui_patched/imgui_widgets.cpp
vendored
6
extern/imgui_patched/imgui_widgets.cpp
vendored
|
@ -7383,13 +7383,13 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
|
||||||
// Render
|
// Render
|
||||||
if (is_visible)
|
if (is_visible)
|
||||||
{
|
{
|
||||||
const bool highlighted = hovered || (flags & ImGuiSelectableFlags_Highlight);
|
const bool highlighted = (hovered || (flags & ImGuiSelectableFlags_Highlight)) && !(g.IO.ConfigFlags&ImGuiConfigFlags_NoHoverColors);
|
||||||
if ((highlighted || selected) && !(g.IO.ConfigFlags&ImGuiConfigFlags_NoHoverColors))
|
if ((highlighted || selected))
|
||||||
{
|
{
|
||||||
// FIXME-MULTISELECT: Styling: Color for 'selected' elements? ImGuiCol_HeaderSelected
|
// FIXME-MULTISELECT: Styling: Color for 'selected' elements? ImGuiCol_HeaderSelected
|
||||||
ImU32 col;
|
ImU32 col;
|
||||||
if (selected && !highlighted)
|
if (selected && !highlighted)
|
||||||
col = GetColorU32(ImLerp(GetStyleColorVec4(ImGuiCol_Header), GetStyleColorVec4(ImGuiCol_HeaderHovered), 0.5f));
|
col = GetColorU32(GetStyleColorVec4(ImGuiCol_Header)); // tildearrow: this was ImLerp. why!
|
||||||
else
|
else
|
||||||
col = GetColorU32((held && highlighted) ? ImGuiCol_HeaderActive : highlighted ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
|
col = GetColorU32((held && highlighted) ? ImGuiCol_HeaderActive : highlighted ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
|
||||||
RenderFrame(bb.Min, bb.Max, col, false, 0.0f);
|
RenderFrame(bb.Min, bb.Max, col, false, 0.0f);
|
||||||
|
|
Loading…
Reference in a new issue