mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge 77550b8d37 into 396b33d0d0
This commit is contained in:
commit
37e01baff2
3 changed files with 9 additions and 2 deletions
|
|
@ -3791,6 +3791,7 @@ const char* ImGui::GetStyleColorName(ImGuiCol idx)
|
|||
case ImGuiCol_Header: return "Header";
|
||||
case ImGuiCol_HeaderHovered: return "HeaderHovered";
|
||||
case ImGuiCol_HeaderActive: return "HeaderActive";
|
||||
case ImGuiCol_HeaderSelected: return "HeaderSelected";
|
||||
case ImGuiCol_Separator: return "Separator";
|
||||
case ImGuiCol_SeparatorHovered: return "SeparatorHovered";
|
||||
case ImGuiCol_SeparatorActive: return "SeparatorActive";
|
||||
|
|
|
|||
1
imgui.h
1
imgui.h
|
|
@ -1835,6 +1835,7 @@ enum ImGuiCol_
|
|||
ImGuiCol_Header, // Header* colors are used for CollapsingHeader, TreeNode, Selectable, MenuItem
|
||||
ImGuiCol_HeaderHovered,
|
||||
ImGuiCol_HeaderActive,
|
||||
ImGuiCol_HeaderSelected,
|
||||
ImGuiCol_Separator,
|
||||
ImGuiCol_SeparatorHovered,
|
||||
ImGuiCol_SeparatorActive,
|
||||
|
|
|
|||
|
|
@ -7052,9 +7052,14 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
|
|||
else
|
||||
{
|
||||
// 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);
|
||||
}
|
||||
RenderNavCursor(frame_bb, id, nav_render_cursor_flags);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue