|
@@ -344,7 +344,7 @@ namespace ImGui
|
|
// - Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window. Child windows can embed their own child.
|
|
// - Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window. Child windows can embed their own child.
|
|
// - Before 1.90 (November 2023), the "ImGuiChildFlags child_flags = 0" parameter was "bool border = false".
|
|
// - Before 1.90 (November 2023), the "ImGuiChildFlags child_flags = 0" parameter was "bool border = false".
|
|
// This API is backward compatible with old code, as we guarantee that ImGuiChildFlags_Border == true.
|
|
// This API is backward compatible with old code, as we guarantee that ImGuiChildFlags_Border == true.
|
|
- // Consider updating your old call sites:
|
|
|
|
|
|
+ // Consider updating your old code:
|
|
// BeginChild("Name", size, false) -> Begin("Name", size, 0); or Begin("Name", size, ImGuiChildFlags_None);
|
|
// BeginChild("Name", size, false) -> Begin("Name", size, 0); or Begin("Name", size, ImGuiChildFlags_None);
|
|
// BeginChild("Name", size, true) -> Begin("Name", size, ImGuiChildFlags_Border);
|
|
// BeginChild("Name", size, true) -> Begin("Name", size, ImGuiChildFlags_Border);
|
|
// - Manual sizing (each axis can use a different setting e.g. ImVec2(0.0f, 400.0f)):
|
|
// - Manual sizing (each axis can use a different setting e.g. ImVec2(0.0f, 400.0f)):
|
|
@@ -1027,7 +1027,7 @@ enum ImGuiWindowFlags_
|
|
};
|
|
};
|
|
|
|
|
|
// Flags for ImGui::BeginChild()
|
|
// Flags for ImGui::BeginChild()
|
|
-// (Legacy: bot 0 must always correspond to ImGuiChildFlags_Border to be backward compatible with old API using 'bool border = false'.
|
|
|
|
|
|
+// (Legacy: bit 0 must always correspond to ImGuiChildFlags_Border to be backward compatible with old API using 'bool border = false'.
|
|
// About using AutoResizeX/AutoResizeY flags:
|
|
// About using AutoResizeX/AutoResizeY flags:
|
|
// - May be combined with SetNextWindowSizeConstraints() to set a min/max size for each axis (see "Demo->Child->Auto-resize with Constraints").
|
|
// - May be combined with SetNextWindowSizeConstraints() to set a min/max size for each axis (see "Demo->Child->Auto-resize with Constraints").
|
|
// - Size measurement for a given axis is only performed when the child window is within visible boundaries, or is just appearing.
|
|
// - Size measurement for a given axis is only performed when the child window is within visible boundaries, or is just appearing.
|
|
@@ -1038,7 +1038,7 @@ enum ImGuiWindowFlags_
|
|
enum ImGuiChildFlags_
|
|
enum ImGuiChildFlags_
|
|
{
|
|
{
|
|
ImGuiChildFlags_None = 0,
|
|
ImGuiChildFlags_None = 0,
|
|
- ImGuiChildFlags_Border = 1 << 0, // Show an outer border and enable WindowPadding. (Important: this is always == 1 == true for legacy reason)
|
|
|
|
|
|
+ ImGuiChildFlags_Border = 1 << 0, // Show an outer border and enable WindowPadding. (IMPORTANT: this is always == 1 == true for legacy reason)
|
|
ImGuiChildFlags_AlwaysUseWindowPadding = 1 << 1, // Pad with style.WindowPadding even if no border are drawn (no padding by default for non-bordered child windows because it makes more sense)
|
|
ImGuiChildFlags_AlwaysUseWindowPadding = 1 << 1, // Pad with style.WindowPadding even if no border are drawn (no padding by default for non-bordered child windows because it makes more sense)
|
|
ImGuiChildFlags_ResizeX = 1 << 2, // Allow resize from right border (layout direction). Enable .ini saving (unless ImGuiWindowFlags_NoSavedSettings passed to window flags)
|
|
ImGuiChildFlags_ResizeX = 1 << 2, // Allow resize from right border (layout direction). Enable .ini saving (unless ImGuiWindowFlags_NoSavedSettings passed to window flags)
|
|
ImGuiChildFlags_ResizeY = 1 << 3, // Allow resize from bottom border (layout direction). "
|
|
ImGuiChildFlags_ResizeY = 1 << 3, // Allow resize from bottom border (layout direction). "
|
|
@@ -1107,8 +1107,8 @@ enum ImGuiTreeNodeFlags_
|
|
};
|
|
};
|
|
|
|
|
|
// Flags for OpenPopup*(), BeginPopupContext*(), IsPopupOpen() functions.
|
|
// Flags for OpenPopup*(), BeginPopupContext*(), IsPopupOpen() functions.
|
|
-// - To be backward compatible with older API which took an 'int mouse_button = 1' argument, we need to treat
|
|
|
|
-// small flags values as a mouse button index, so we encode the mouse button in the first few bits of the flags.
|
|
|
|
|
|
+// - To be backward compatible with older API which took an 'int mouse_button = 1' argument instead of 'ImGuiPopupFlags flags',
|
|
|
|
+// we need to treat small flags values as a mouse button index, so we encode the mouse button in the first few bits of the flags.
|
|
// It is therefore guaranteed to be legal to pass a mouse button index in ImGuiPopupFlags.
|
|
// It is therefore guaranteed to be legal to pass a mouse button index in ImGuiPopupFlags.
|
|
// - For the same reason, we exceptionally default the ImGuiPopupFlags argument of BeginPopupContextXXX functions to 1 instead of 0.
|
|
// - For the same reason, we exceptionally default the ImGuiPopupFlags argument of BeginPopupContextXXX functions to 1 instead of 0.
|
|
// IMPORTANT: because the default parameter is 1 (==ImGuiPopupFlags_MouseButtonRight), if you rely on the default parameter
|
|
// IMPORTANT: because the default parameter is 1 (==ImGuiPopupFlags_MouseButtonRight), if you rely on the default parameter
|