|
@@ -1,4 +1,4 @@
|
|
|
-// dear imgui, v1.89.8
|
|
|
+// dear imgui, v1.89.9 WIP
|
|
|
// (widgets code)
|
|
|
|
|
|
/*
|
|
@@ -492,7 +492,7 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
|
|
|
// Note that _both_ ButtonFlags and ItemFlags are valid sources, so copy one into the item_flags and only check that.
|
|
|
ImGuiItemFlags item_flags = (g.LastItemData.ID == id ? g.LastItemData.InFlags : g.CurrentItemFlags);
|
|
|
if (flags & ImGuiButtonFlags_AllowOverlap)
|
|
|
- item_flags |= ImGuiItemflags_AllowOverlap;
|
|
|
+ item_flags |= ImGuiItemFlags_AllowOverlap;
|
|
|
if (flags & ImGuiButtonFlags_Repeat)
|
|
|
item_flags |= ImGuiItemFlags_ButtonRepeat;
|
|
|
|
|
@@ -6176,7 +6176,7 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
|
|
|
}
|
|
|
|
|
|
ImGuiButtonFlags button_flags = ImGuiTreeNodeFlags_None;
|
|
|
- if ((flags & ImGuiTreeNodeFlags_AllowOverlap) || (g.LastItemData.InFlags & ImGuiItemflags_AllowOverlap))
|
|
|
+ if ((flags & ImGuiTreeNodeFlags_AllowOverlap) || (g.LastItemData.InFlags & ImGuiItemFlags_AllowOverlap))
|
|
|
button_flags |= ImGuiButtonFlags_AllowOverlap;
|
|
|
if (!is_leaf)
|
|
|
button_flags |= ImGuiButtonFlags_PressedOnDragDropHold;
|
|
@@ -6506,7 +6506,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
|
|
|
if (flags & ImGuiSelectableFlags_SelectOnClick) { button_flags |= ImGuiButtonFlags_PressedOnClick; }
|
|
|
if (flags & ImGuiSelectableFlags_SelectOnRelease) { button_flags |= ImGuiButtonFlags_PressedOnRelease; }
|
|
|
if (flags & ImGuiSelectableFlags_AllowDoubleClick) { button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; }
|
|
|
- if ((flags & ImGuiSelectableFlags_AllowOverlap) || (g.LastItemData.InFlags & ImGuiItemflags_AllowOverlap)) { button_flags |= ImGuiButtonFlags_AllowOverlap; }
|
|
|
+ if ((flags & ImGuiSelectableFlags_AllowOverlap) || (g.LastItemData.InFlags & ImGuiItemFlags_AllowOverlap)) { button_flags |= ImGuiButtonFlags_AllowOverlap; }
|
|
|
|
|
|
const bool was_selected = selected;
|
|
|
bool hovered, held;
|