Internals: Added Name to ImGuiDataTypeInfo + minor misc comments in BeginGroup().
diff --git a/imgui.cpp b/imgui.cpp
index 922cbd0..c352c8a 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -7271,10 +7271,11 @@
}
// Lock horizontal starting position + capture group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.)
+// Groups are currently a mishmash of functionalities which should perhaps be clarified and separated.
void ImGui::BeginGroup()
{
ImGuiContext& g = *GImGui;
- ImGuiWindow* window = GetCurrentWindow();
+ ImGuiWindow* window = g.CurrentWindow;
window->DC.GroupStack.resize(window->DC.GroupStack.Size + 1);
ImGuiGroupData& group_data = window->DC.GroupStack.back();
@@ -7299,8 +7300,8 @@
void ImGui::EndGroup()
{
ImGuiContext& g = *GImGui;
- ImGuiWindow* window = GetCurrentWindow();
- IM_ASSERT(!window->DC.GroupStack.empty()); // Mismatched BeginGroup()/EndGroup() calls
+ ImGuiWindow* window = g.CurrentWindow;
+ IM_ASSERT(window->DC.GroupStack.Size > 0); // Mismatched BeginGroup()/EndGroup() calls
ImGuiGroupData& group_data = window->DC.GroupStack.back();
@@ -7328,9 +7329,9 @@
// If the current ActiveId was declared within the boundary of our group, we copy it to LastItemId so IsItemActive(), IsItemDeactivated() etc. will be functional on the entire group.
// It would be be neater if we replaced window.DC.LastItemId by e.g. 'bool LastItemIsActive', but would put a little more burden on individual widgets.
// Also if you grep for LastItemId you'll notice it is only used in that context.
- // (The tests not symmetrical because ActiveIdIsAlive is an ID itself, in order to be able to handle ActiveId being overwritten during the frame.)
+ // (The two tests not the same because ActiveIdIsAlive is an ID itself, in order to be able to handle ActiveId being overwritten during the frame.)
const bool group_contains_curr_active_id = (group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId;
- const bool group_contains_prev_active_id = !group_data.BackupActiveIdPreviousFrameIsAlive && g.ActiveIdPreviousFrameIsAlive;
+ const bool group_contains_prev_active_id = (group_data.BackupActiveIdPreviousFrameIsAlive == false) && (g.ActiveIdPreviousFrameIsAlive == true);
if (group_contains_curr_active_id)
window->DC.LastItemId = g.ActiveId;
else if (group_contains_prev_active_id)
diff --git a/imgui_internal.h b/imgui_internal.h
index 00baf03..5f55d21 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -786,7 +786,8 @@
// Type information associated to one ImGuiDataType. Retrieve with DataTypeGetInfo().
struct ImGuiDataTypeInfo
{
- size_t Size; // Size in byte
+ size_t Size; // Size in bytes
+ const char* Name; // Short descriptive name for the type, for debugging
const char* PrintFmt; // Default printf format for the type
const char* ScanFmt; // Default scanf format for the type
};
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 352b687..691b36f 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -1687,21 +1687,21 @@
static const ImGuiDataTypeInfo GDataTypeInfo[] =
{
- { sizeof(char), "%d", "%d" }, // ImGuiDataType_S8
- { sizeof(unsigned char), "%u", "%u" },
- { sizeof(short), "%d", "%d" }, // ImGuiDataType_S16
- { sizeof(unsigned short), "%u", "%u" },
- { sizeof(int), "%d", "%d" }, // ImGuiDataType_S32
- { sizeof(unsigned int), "%u", "%u" },
+ { sizeof(char), "S8", "%d", "%d" }, // ImGuiDataType_S8
+ { sizeof(unsigned char), "U8", "%u", "%u" },
+ { sizeof(short), "S16", "%d", "%d" }, // ImGuiDataType_S16
+ { sizeof(unsigned short), "U16", "%u", "%u" },
+ { sizeof(int), "S32", "%d", "%d" }, // ImGuiDataType_S32
+ { sizeof(unsigned int), "U32", "%u", "%u" },
#ifdef _MSC_VER
- { sizeof(ImS64), "%I64d","%I64d" }, // ImGuiDataType_S64
- { sizeof(ImU64), "%I64u","%I64u" },
+ { sizeof(ImS64), "S64", "%I64d","%I64d" }, // ImGuiDataType_S64
+ { sizeof(ImU64), "U64", "%I64u","%I64u" },
#else
- { sizeof(ImS64), "%lld", "%lld" }, // ImGuiDataType_S64
- { sizeof(ImU64), "%llu", "%llu" },
+ { sizeof(ImS64), "S64", "%lld", "%lld" }, // ImGuiDataType_S64
+ { sizeof(ImU64), "U64", "%llu", "%llu" },
#endif
- { sizeof(float), "%f", "%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg)
- { sizeof(double), "%f", "%lf" }, // ImGuiDataType_Double
+ { sizeof(float), "float", "%f", "%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg)
+ { sizeof(double), "double","%f", "%lf" }, // ImGuiDataType_Double
};
IM_STATIC_ASSERT(IM_ARRAYSIZE(GDataTypeInfo) == ImGuiDataType_COUNT);
