Comments
diff --git a/imgui.cpp b/imgui.cpp
index 7a4b3c6..e57cdba 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -9739,7 +9739,6 @@
TextUnformatted(label, FindRenderedTextEnd(label));
EndGroup();
PopID();
-
return value_changed;
}
@@ -10098,9 +10097,7 @@
{
const bool pressed = RadioButton(label, *v == v_button);
if (pressed)
- {
*v = v_button;
- }
return pressed;
}
@@ -10381,7 +10378,7 @@
const bool is_password = (flags & ImGuiInputTextFlags_Password) != 0;
const bool is_undoable = (flags & ImGuiInputTextFlags_NoUndoRedo) == 0;
- if (is_multiline) // Open group before calling GetID() because groups tracks id created during their spawn
+ if (is_multiline) // Open group before calling GetID() because groups tracks id created within their scope,
BeginGroup();
const ImGuiID id = window->GetID(label);
const ImVec2 label_size = CalcTextSize(label, NULL, true);
@@ -11090,7 +11087,6 @@
TextUnformatted(label, FindRenderedTextEnd(label));
EndGroup();
-
return value_changed;
}
@@ -11468,6 +11464,7 @@
return false;
}
+// FIXME: Rename to BeginListBox()
// Helper to calculate the size of a listbox and display a label on the right.
// Tip: To have a list filling the entire window width, PushItemWidth(-1) and pass an empty label "##empty"
bool ImGui::ListBoxHeader(const char* label, const ImVec2& size_arg)
@@ -11495,6 +11492,7 @@
return true;
}
+// FIXME: Rename to BeginListBox()
bool ImGui::ListBoxHeader(const char* label, int items_count, int height_in_items)
{
// Size default to hold ~7 items. Fractional number of items helps seeing that we can scroll down/up without looking at scrollbar.
@@ -11511,6 +11509,7 @@
return ListBoxHeader(label, size);
}
+// FIXME: Rename to EndListBox()
void ImGui::ListBoxFooter()
{
ImGuiWindow* parent_window = GetCurrentWindow()->ParentWindow;
@@ -11658,7 +11657,7 @@
return false;
IM_ASSERT(!window->DC.MenuBarAppending);
- BeginGroup(); // Save position
+ BeginGroup(); // Backup position on layer 0
PushID("##menubar");
// We don't clip with current window clipping rectangle as it is already set to the area below. However we clip with window full rect.
@@ -11710,7 +11709,7 @@
PopID();
window->DC.MenuBarOffset.x = window->DC.CursorPos.x - window->MenuBarRect().Min.x; // Save horizontal position so next append can reuse it. This is kinda equivalent to a per-layer CursorPos.
window->DC.GroupStack.back().AdvanceCursor = false;
- EndGroup();
+ EndGroup(); // Restore position on layer 0
window->DC.LayoutType = ImGuiLayoutType_Vertical;
window->DC.NavLayerCurrent--;
window->DC.NavLayerCurrentMask >>= 1;
@@ -12792,6 +12791,7 @@
// 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.)
void ImGui::BeginGroup()
{
+ ImGuiContext& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow();
window->DC.GroupStack.resize(window->DC.GroupStack.Size + 1);
@@ -12803,21 +12803,20 @@
group_data.BackupCurrentLineHeight = window->DC.CurrentLineHeight;
group_data.BackupCurrentLineTextBaseOffset = window->DC.CurrentLineTextBaseOffset;
group_data.BackupLogLinePosY = window->DC.LogLinePosY;
- group_data.BackupActiveIdIsAlive = GImGui->ActiveIdIsAlive;
+ group_data.BackupActiveIdIsAlive = g.ActiveIdIsAlive;
group_data.AdvanceCursor = true;
window->DC.GroupOffsetX = window->DC.CursorPos.x - window->Pos.x - window->DC.ColumnsOffsetX;
window->DC.IndentX = window->DC.GroupOffsetX;
window->DC.CursorMaxPos = window->DC.CursorPos;
window->DC.CurrentLineHeight = 0.0f;
- window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f;
+ window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f; // To enforce Log carriage return
}
void ImGui::EndGroup()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow();
-
IM_ASSERT(!window->DC.GroupStack.empty()); // Mismatched BeginGroup()/EndGroup() calls
ImGuiGroupData& group_data = window->DC.GroupStack.back();
@@ -12827,11 +12826,11 @@
window->DC.CursorPos = group_data.BackupCursorPos;
window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos);
- window->DC.CurrentLineHeight = group_data.BackupCurrentLineHeight;
- window->DC.CurrentLineTextBaseOffset = group_data.BackupCurrentLineTextBaseOffset;
window->DC.IndentX = group_data.BackupIndentX;
window->DC.GroupOffsetX = group_data.BackupGroupOffsetX;
- window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f;
+ window->DC.CurrentLineHeight = group_data.BackupCurrentLineHeight;
+ window->DC.CurrentLineTextBaseOffset = group_data.BackupCurrentLineTextBaseOffset;
+ window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f; // To enforce Log carriage return
if (group_data.AdvanceCursor)
{
diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 1ec1404..53367a0 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -328,6 +328,7 @@
{
// Using the _simplified_ one-liner Combo() api here
+ // See "Combo" section for examples of how to use the more complete BeginCombo()/EndCombo() api.
const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" };
static int item_current = 0;
ImGui::Combo("combo", &item_current, items, IM_ARRAYSIZE(items));
diff --git a/imgui_internal.h b/imgui_internal.h
index eb07f01..1ef9ce9 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -980,7 +980,7 @@
ImRect OuterRectClipped; // = WindowRect just after setup in Begin(). == window->Rect() for root window.
ImRect InnerMainRect, InnerClipRect;
ImRect ContentsRegionRect; // FIXME: This is currently confusing/misleading. Maximum visible content position ~~ Pos + (SizeContentsExplicit ? SizeContentsExplicit : Size - ScrollbarSizes) - CursorStartPos, per axis
- int LastFrameActive;
+ int LastFrameActive; // Last frame number the window was Active.
float ItemWidthDefault;
ImGuiMenuColumns MenuColumns; // Simplified columns storage for menu items
ImGuiStorage StateStorage;
