mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge 77550b8d37 into 396b33d0d0

Browse source
This commit is contained in:
Timo Suoranta 2026-01-04 18:41:43 +01:00 • committed by GitHub
commit 37e01baff2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
imgui.cpp
View file

@ -3791,6 +3791,7 @@ const char* ImGui::GetStyleColorName(ImGuiCol idx)
case ImGuiCol_Header: return "Header"; case ImGuiCol_Header: return "Header";
case ImGuiCol_HeaderHovered: return "HeaderHovered"; case ImGuiCol_HeaderHovered: return "HeaderHovered";
case ImGuiCol_HeaderActive: return "HeaderActive"; case ImGuiCol_HeaderActive: return "HeaderActive";
case ImGuiCol_HeaderSelected: return "HeaderSelected";
case ImGuiCol_Separator: return "Separator"; case ImGuiCol_Separator: return "Separator";
case ImGuiCol_SeparatorHovered: return "SeparatorHovered"; case ImGuiCol_SeparatorHovered: return "SeparatorHovered";
case ImGuiCol_SeparatorActive: return "SeparatorActive"; case ImGuiCol_SeparatorActive: return "SeparatorActive";

1
imgui.h
View file

@ -1835,6 +1835,7 @@ enum ImGuiCol_
ImGuiCol_Header, // Header* colors are used for CollapsingHeader, TreeNode, Selectable, MenuItem ImGuiCol_Header, // Header* colors are used for CollapsingHeader, TreeNode, Selectable, MenuItem
ImGuiCol_HeaderHovered, ImGuiCol_HeaderHovered,
ImGuiCol_HeaderActive, ImGuiCol_HeaderActive,
ImGuiCol_HeaderSelected,
ImGuiCol_Separator, ImGuiCol_Separator,
ImGuiCol_SeparatorHovered, ImGuiCol_SeparatorHovered,
ImGuiCol_SeparatorActive, ImGuiCol_SeparatorActive,

9
imgui_widgets.cpp
View file

@ -7052,9 +7052,14 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
else else
{ {
// Unframed typed for tree nodes // Unframed typed for tree nodes
if (hovered || selected) if (selected)
{ {
const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); const ImU32 bg_col = GetColorU32(ImGuiCol_HeaderSelected);
RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false);
}
if (hovered)
{
const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : ImGuiCol_HeaderHovered);
RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false); RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false);
} }
RenderNavCursor(frame_bb, id, nav_render_cursor_flags); RenderNavCursor(frame_bb, id, nav_render_cursor_flags);