InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200)
diff --git a/imgui.cpp b/imgui.cpp
index d111352..6ffccc6 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3293,13 +3293,13 @@
}
// Helper to create a child window / scrolling region that looks like a normal widget frame.
-void ImGui::BeginChildFrame(ImGuiID id, const ImVec2& size)
+bool ImGui::BeginChildFrame(ImGuiID id, const ImVec2& size)
{
ImGuiState& g = *GImGui;
const ImGuiStyle& style = g.Style;
ImGui::PushStyleColor(ImGuiCol_ChildWindowBg, style.Colors[ImGuiCol_FrameBg]);
ImGui::PushStyleVar(ImGuiStyleVar_ChildWindowRounding, style.FrameRounding);
- ImGui::BeginChild(id, size);
+ return ImGui::BeginChild(id, size);
}
void ImGui::EndChildFrame()
@@ -6775,7 +6775,7 @@
ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
ImVec2 size;
size.x = (size_arg.x != 0.0f) ? size_arg.x : ImGui::CalcItemWidth();
- size.y = (size_arg.y != 0.0f) ? size_arg.y : is_multiline ? ImGui::GetTextLineHeight() * 8.0f : label_size.y; // Arbitrary default
+ size.y = (size_arg.y != 0.0f) ? size_arg.y : is_multiline ? ImGui::GetTextLineHeight() * 8.0f : label_size.y; // Arbitrary default of 8 lines high for multi-line
const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + size + style.FramePadding*2.0f);
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? (style.ItemInnerSpacing.x + label_size.x) : 0.0f, 0.0f));
@@ -6784,7 +6784,12 @@
if (is_multiline)
{
ImGui::BeginGroup();
- ImGui::BeginChildFrame(id, frame_bb.GetSize());
+ if (!ImGui::BeginChildFrame(id, frame_bb.GetSize()))
+ {
+ ImGui::EndChildFrame();
+ ImGui::EndGroup();
+ return false;
+ }
child_window = GetCurrentWindow();
child_window->DC.CursorPos += style.FramePadding;
size.x -= child_window->ScrollbarWidth();
@@ -7092,7 +7097,7 @@
if (!is_multiline)
RenderFrame(frame_bb.Min, frame_bb.Max, window->Color(ImGuiCol_FrameBg), true, style.FrameRounding);
- const float font_offy_up = g.FontSize+1.0f; // FIXME: those offsets are part of the style or font API
+ const float font_offy_up = g.FontSize+1.0f; // FIXME: those offsets should be part of the style? they don't play so well with multi-line selection.
const float font_offy_dn = 2.0f;
const ImVec2 render_pos = is_multiline ? GetCurrentWindow()->DC.CursorPos : frame_bb.Min + style.FramePadding;
diff --git a/imgui.h b/imgui.h
index aa34324..b864361 100644
--- a/imgui.h
+++ b/imgui.h
@@ -373,7 +373,7 @@
IMGUI_API ImVec2 CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
IMGUI_API void CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end); // calculate coarse clipping for large list of evenly sized items. Prefer using the ImGuiListClipper higher-level helper if you can.
- IMGUI_API void BeginChildFrame(ImGuiID id, const ImVec2& size); // helper to create a child window / scrolling region that looks like a normal widget frame
+ IMGUI_API bool BeginChildFrame(ImGuiID id, const ImVec2& size); // helper to create a child window / scrolling region that looks like a normal widget frame
IMGUI_API void EndChildFrame();
IMGUI_API ImU32 ColorConvertFloat4ToU32(const ImVec4& in);
