Skip to content

Commit 1e29c8d

Browse files
thedmdpthom
authored andcommitted
thedmd: Stack Layout implementation v2.1 / pthom: revert clipping
See ocornut#846 (comment) : clipping has an issue, when mixed with your node editor and springs.
1 parent feddd77 commit 1e29c8d

File tree

7 files changed

+1403
-5
lines changed

7 files changed

+1403
-5
lines changed

imgui.cpp

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,7 @@ ImGuiStyle::ImGuiStyle()
14091409
ScrollbarRounding = 9.0f; // Radius of grab corners rounding for scrollbar
14101410
GrabMinSize = 12.0f; // Minimum width/height of a grab box for slider/scrollbar
14111411
GrabRounding = 0.0f; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
1412+
LayoutAlign = 0.5f; // Element alignment inside horizontal and vertical layouts (0.0f - left/top, 1.0f - right/bottom, 0.5f - center).
14121413
LogSliderDeadzone = 4.0f; // The size in pixels of the dead-zone around zero on logarithmic sliders that cross zero.
14131414
ImageBorderSize = 0.0f; // Thickness of border around tabs.
14141415
TabRounding = 5.0f; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
@@ -3563,7 +3564,8 @@ static const ImGuiStyleVarInfo GStyleVarsInfo[] =
35633564
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ScrollbarRounding) }, // ImGuiStyleVar_ScrollbarRounding
35643565
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, GrabMinSize) }, // ImGuiStyleVar_GrabMinSize
35653566
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, GrabRounding) }, // ImGuiStyleVar_GrabRounding
3566-
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ImageBorderSize) }, // ImGuiStyleVar_ImageBorderSize
3567+
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ImageBorderSize) }, // ImGuiStyleVar_ImageBorderSize
3568+
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, LayoutAlign) }, // ImGuiStyleVar_LayoutAlign
35673569
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabRounding) }, // ImGuiStyleVar_TabRounding
35683570
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabBorderSize) }, // ImGuiStyleVar_TabBorderSize
35693571
{ 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabBarBorderSize) }, // ImGuiStyleVar_TabBarBorderSize
@@ -11706,6 +11708,10 @@ bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg, ImGu
1170611708
g.NextItemData.HasFlags = ImGuiNextItemDataFlags_None;
1170711709
g.NextItemData.ItemFlags = ImGuiItemFlags_None;
1170811710

11711+
#if IMGUI_HAS_STACK_LAYOUT
11712+
ImGuiInternal::UpdateItemRect(window->ID, bb.Min, bb.Max);
11713+
#endif
11714+
1170911715
#ifdef IMGUI_ENABLE_TEST_ENGINE
1171011716
if (id != 0)
1171111717
IMGUI_TEST_ENGINE_ITEM_ADD(id, g.LastItemData.NavRect, &g.LastItemData);
@@ -11790,6 +11796,38 @@ void ImGui::ItemSize(const ImVec2& size, float text_baseline_y)
1179011796
if (window->SkipItems)
1179111797
return;
1179211798

11799+
#if IMGUI_HAS_STACK_LAYOUT
11800+
ImGuiLayoutType layout_type = ImGuiInternal::GetCurrentLayoutType(window->ID);
11801+
#else
11802+
ImGuiLayoutType layout_type = window->DC.LayoutType;
11803+
#endif
11804+
11805+
//if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorPos, 3.0f, IM_COL32(255,255,0,255), 4); // [DEBUG] Widget position
11806+
11807+
// Stack Layouts: Handle horizontal case first to simplify merge in case code handling vertical changes.
11808+
if (layout_type == ImGuiLayoutType_Horizontal)
11809+
{
11810+
const float line_width = ImMax(window->DC.CurrLineSize.x, size.x);
11811+
11812+
// Always align ourselves on pixel boundaries
11813+
//if (g.IO.KeyAlt) window->DrawList->AddRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(size.x, line_height), IM_COL32(255,0,0,200)); // [DEBUG]
11814+
window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x;
11815+
window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y + size.y;
11816+
window->DC.CursorPos.x = IM_TRUNC(window->DC.CursorPos.x + line_width + g.Style.ItemSpacing.x);
11817+
window->DC.CursorPos.y = IM_TRUNC(window->DC.CursorPosPrevLine.y - size.y);
11818+
window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPos.x - g.Style.ItemSpacing.x);
11819+
window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPosPrevLine.y);
11820+
//if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG]
11821+
11822+
window->DC.PrevLineSize.x = line_width;
11823+
window->DC.PrevLineSize.y = 0.0f;
11824+
window->DC.CurrLineSize.x = 0.0f;
11825+
window->DC.PrevLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, text_baseline_y);
11826+
window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset;
11827+
window->DC.IsSameLine = window->DC.IsSetPos = false;
11828+
return;
11829+
}
11830+
1179311831
// We increase the height in this function to accommodate for baseline offset.
1179411832
// In theory we should be offsetting the starting position (window->DC.CursorPos), that will be the topic of a larger refactor,
1179511833
// but since ItemSize() is not yet an API that moves the cursor (to handle e.g. wrapping) enlarging the height has the same effect.
@@ -11808,15 +11846,12 @@ void ImGui::ItemSize(const ImVec2& size, float text_baseline_y)
1180811846
window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y);
1180911847
//if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG]
1181011848

11849+
window->DC.PrevLineSize.x = 0.0f;
1181111850
window->DC.PrevLineSize.y = line_height;
1181211851
window->DC.CurrLineSize.y = 0.0f;
1181311852
window->DC.PrevLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, text_baseline_y);
1181411853
window->DC.CurrLineTextBaseOffset = 0.0f;
1181511854
window->DC.IsSameLine = window->DC.IsSetPos = false;
11816-
11817-
// Horizontal layout mode
11818-
if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
11819-
SameLine();
1182011855
}
1182111856
IM_MSVC_RUNTIME_CHECKS_RESTORE
1182211857

imgui.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3535
#define IMGUI_HAS_DOCK // Docking WIP branch
3636
#define IMGUI_HAS_TEXTURES // 1.92+ WIP branch with ImGuiBackendFlags_RendererHasTextures
37+
#define IMGUI_HAS_STACK_LAYOUT 1 // Stack-Layout PR #846
38+
3739

3840
//
3941
// Adaptations for ImGui Bundle are noted with [ADAPT_IMGUI_BUNDLE]
@@ -1936,6 +1938,7 @@ enum ImGuiStyleVar_
19361938
ImGuiStyleVar_GrabMinSize, // float GrabMinSize
19371939
ImGuiStyleVar_GrabRounding, // float GrabRounding
19381940
ImGuiStyleVar_ImageBorderSize, // float ImageBorderSize
1941+
ImGuiStyleVar_LayoutAlign, // float LayoutAlign
19391942
ImGuiStyleVar_TabRounding, // float TabRounding
19401943
ImGuiStyleVar_TabBorderSize, // float TabBorderSize
19411944
ImGuiStyleVar_TabBarBorderSize, // float TabBarBorderSize
@@ -2436,6 +2439,7 @@ struct ImGuiStyle
24362439
float ScrollbarRounding; // Radius of grab corners for scrollbar.
24372440
float GrabMinSize; // Minimum width/height of a grab box for slider/scrollbar.
24382441
float GrabRounding; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
2442+
float LayoutAlign; // Element alignment inside horizontal and vertical layouts (0.0f - left/top, 1.0f - right/bottom, 0.5f - center).
24392443
float LogSliderDeadzone; // The size in pixels of the dead-zone around zero on logarithmic sliders that cross zero.
24402444
float ImageBorderSize; // Thickness of border around Image() calls.
24412445
float TabRounding; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
@@ -4530,6 +4534,10 @@ typedef ImFontAtlasRect ImFontAtlasCustomRect;
45304534
#pragma warning (pop)
45314535
#endif
45324536

4537+
#if IMGUI_HAS_STACK_LAYOUT
4538+
#include "imgui_stacklayout.h"
4539+
#endif
4540+
45334541
// Include imgui_user.h at the end of imgui.h
45344542
// May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included.
45354543
#ifdef IMGUI_INCLUDE_IMGUI_USER_H

imgui_demo.cpp

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5234,6 +5234,156 @@ static void DemoWindowLayout()
52345234

52355235
ImGui::TreePop();
52365236
}
5237+
5238+
#if IMGUI_HAS_STACK_LAYOUT
5239+
IMGUI_DEMO_MARKER("Layout/Stack Layout");
5240+
if (ImGui::TreeNode("Stack Layout"))
5241+
{
5242+
static bool widget_a = true, widget_b = true, widget_c = true;
5243+
static bool spring_a = true, spring_ab = true, spring_bc = true, spring_c = true;
5244+
static bool minimize_width = false, minimize_height = true;
5245+
static bool horizontal = true, draw_springs = true;
5246+
static ImVec2 item_spacing = ImGui::GetStyle().ItemSpacing;
5247+
static float a_c_spring_weight = 0.0f;
5248+
static float ab_spring_weight = 0.5f;
5249+
static float alignment = 0.5f;
5250+
5251+
struct funcs
5252+
{
5253+
static void VisibleSpring(float spring_weight)
5254+
{
5255+
ImGui::Spring(spring_weight);
5256+
if (!draw_springs)
5257+
return;
5258+
5259+
ImVec2 rect_min = ImGui::GetItemRectMin();
5260+
ImVec2 rect_max = ImGui::GetItemRectMax();
5261+
5262+
ImVec2 rect_size = ImGui::GetItemRectSize();
5263+
if (rect_size.x <= 0.0f && rect_size.y <= 0.0f)
5264+
return;
5265+
5266+
// Draw zig-zag
5267+
float width = 0.0f, spacing = 0.0f;
5268+
ImVec2 direction, origin;
5269+
ImVec2 spacing_min, spring_max;
5270+
5271+
if (horizontal)
5272+
{
5273+
spacing = floorf(item_spacing.x);
5274+
width = rect_size.x - spacing;
5275+
origin = ImVec2(floorf(rect_min.x), floorf(rect_min.y + (rect_max.y - rect_min.y) / 2));
5276+
direction = ImVec2(1.0f, 0.0f);
5277+
spring_max = ImVec2(rect_min.x + width, rect_max.y);
5278+
spacing_min = ImVec2(rect_min.x + width, rect_min.y);
5279+
}
5280+
else
5281+
{
5282+
spacing = floorf(item_spacing.y);
5283+
width = rect_size.y - spacing;
5284+
origin = ImVec2(floorf(rect_min.x + (rect_max.x - rect_min.x) / 2), floorf(rect_min.y));
5285+
direction = ImVec2(0.0f, 1.0f);
5286+
spring_max = ImVec2(rect_max.x, rect_min.y + width);
5287+
spacing_min = ImVec2(rect_min.x, rect_min.y + width);
5288+
}
5289+
5290+
if (spring_weight <= 0.0f && spacing <= 0.0f)
5291+
return;
5292+
5293+
ImDrawList* draw_list = ImGui::GetWindowDrawList();
5294+
5295+
draw_list->PushClipRect(rect_min, rect_max, true);
5296+
5297+
draw_list->AddRectFilled(rect_min, spring_max, ImColor(80, 20, 80));
5298+
draw_list->AddRectFilled(spacing_min, rect_max, ImColor(80, 20, 20));
5299+
5300+
const float zig_zag_size = 3;
5301+
ImVec2 normal = ImVec2(-direction.y, direction.x);
5302+
5303+
draw_list->PathClear();
5304+
origin.x += 0.5f;
5305+
origin.y += 0.5f;
5306+
draw_list->PathLineTo(origin);
5307+
for (float x = zig_zag_size * 0.5f; x <= width; x += zig_zag_size)
5308+
{
5309+
ImVec2 p;
5310+
p.x = origin.x + direction.x * x + normal.x * zig_zag_size;
5311+
p.y = origin.y + direction.y * x + normal.y * zig_zag_size;
5312+
draw_list->PathLineTo(p);
5313+
normal = ImVec2(-normal.x, -normal.y);
5314+
}
5315+
draw_list->PathStroke(ImColor(255, 255, 255, 190), false, 1.0f);
5316+
5317+
draw_list->PopClipRect();
5318+
}
5319+
};
5320+
5321+
ImGui::Checkbox("Widget A", &widget_a); ImGui::SameLine();
5322+
ImGui::Checkbox("Widget B", &widget_b); ImGui::SameLine();
5323+
ImGui::Checkbox("Widget C", &widget_c);
5324+
ImGui::Checkbox("Spring A", &spring_a); ImGui::SameLine();
5325+
ImGui::Checkbox("Spring AB", &spring_ab); ImGui::SameLine();
5326+
ImGui::Checkbox("Spring BC", &spring_bc); ImGui::SameLine();
5327+
ImGui::Checkbox("Spring C", &spring_c);
5328+
ImGui::Checkbox("Horizontal", &horizontal); ImGui::SameLine();
5329+
ImGui::Checkbox("Minimize Width", &minimize_width); ImGui::SameLine();
5330+
ImGui::Checkbox("Minimize Height", &minimize_height);
5331+
ImGui::Checkbox("Draw Springs", &draw_springs); ImGui::SameLine();
5332+
ImGui::TextUnformatted(" "); ImGui::SameLine();
5333+
ImGui::ColorButton("- Spring", ImColor(80, 20, 80), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoPicker); ImGui::SameLine();
5334+
ImGui::TextUnformatted("Spring"); ImGui::SameLine();
5335+
ImGui::TextUnformatted(" "); ImGui::SameLine();
5336+
ImGui::ColorButton("- Spacing", ImColor(80, 20, 20), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoPicker); ImGui::SameLine();
5337+
ImGui::TextUnformatted("Item Spacing");
5338+
ImGui::DragFloat("Item Spacing", horizontal ? &item_spacing.x : &item_spacing.y, 0.1f, 0.0f, 50.0f);
5339+
ImGui::DragFloat("A & C Spring Weight", &a_c_spring_weight, 0.002f, 0.0f, 1.0f);
5340+
ImGui::DragFloat("AB Spring Weight", &ab_spring_weight, 0.002f, 0.0f, 1.0f);
5341+
if (ImGui::IsItemHovered()) ImGui::SetTooltip("BC Spring Weight = 1 - AB Spring Weight");
5342+
ImGui::DragFloat("Minor Axis Alignment", &alignment, 0.002f, 0.0f, 1.0f);
5343+
if (ImGui::IsItemHovered()) ImGui::SetTooltip("This is vertical alignment for horizontal layouts and horizontal alignment for vertical layouts.");
5344+
ImGui::Text("Layout widgets:");
5345+
ImGui::Text("| Spring A | Widget A | Spring AB | Widget B | Spring BC | Widget C | Spring C |");
5346+
5347+
ImGui::Spacing();
5348+
5349+
ImVec2 widget_size;
5350+
widget_size.x = floorf(ImGui::GetContentRegionAvail().x / 4);
5351+
widget_size.y = horizontal ? floorf(widget_size.x / 3) : widget_size.x;
5352+
5353+
ImVec2 small_widget_size = widget_size;
5354+
if (horizontal)
5355+
small_widget_size.y = floorf(small_widget_size.y / 2);
5356+
else
5357+
small_widget_size.x = floorf(small_widget_size.x / 2);
5358+
5359+
ImVec2 layout_size = ImVec2(widget_size.x * 4, widget_size.y * 4);
5360+
if (minimize_width) layout_size.x = 0.0f;
5361+
if (minimize_height) layout_size.y = 0.0f;
5362+
5363+
// Minor axis alignment can be set by style or directly in BeginHorizontal/BeginVertical
5364+
// Example:
5365+
// ImGui::PushStyleVar(ImGuiStyleVar_LayoutAlign, alignment);
5366+
5367+
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(floorf(item_spacing.x), floorf(item_spacing.y)));
5368+
5369+
if (horizontal) { ImGui::BeginHorizontal("h1", layout_size, alignment); } else { ImGui::BeginVertical("v1", layout_size, alignment); }
5370+
if (spring_a) { funcs::VisibleSpring(a_c_spring_weight); }
5371+
if (widget_a) { ImGui::Button("Widget A", widget_size); }
5372+
if (spring_ab) { funcs::VisibleSpring(ab_spring_weight); }
5373+
if (widget_b) { ImGui::Button("Widget B", small_widget_size); }
5374+
if (spring_bc) { funcs::VisibleSpring(1.0f - ab_spring_weight); }
5375+
if (widget_c) { ImGui::Button("Widget C", widget_size); }
5376+
if (spring_c) { funcs::VisibleSpring(a_c_spring_weight); }
5377+
if (horizontal) { ImGui::EndHorizontal(); } else { ImGui::EndVertical(); }
5378+
5379+
ImGui::PopStyleVar();
5380+
5381+
ImDrawList* draw_list = ImGui::GetWindowDrawList();
5382+
draw_list->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), ImGui::GetColorU32(ImGuiCol_Border));
5383+
5384+
ImGui::TreePop();
5385+
}
5386+
#endif // IMGUI_HAS_STACK_LAYOUT
52375387
}
52385388

52395389
//-----------------------------------------------------------------------------

imgui_internal.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Index of this file:
1111
// [SECTION] Forward declarations
1212
// [SECTION] Context pointer
1313
// [SECTION] STB libraries includes
14+
// [SECTION] Stack Layout includes
1415
// [SECTION] Macros
1516
// [SECTION] Generic helpers
1617
// [SECTION] ImDrawList support
@@ -247,6 +248,14 @@ typedef ImU16 ImGuiTableDrawChannelIdx;
247248
extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer
248249
#endif
249250

251+
//-------------------------------------------------------------------------
252+
// [SECTION] Stack Layout includes
253+
//-------------------------------------------------------------------------
254+
255+
#if IMGUI_HAS_STACK_LAYOUT
256+
# include "imgui_stacklayout_internal.h"
257+
#endif
258+
250259
//-----------------------------------------------------------------------------
251260
// [SECTION] Macros
252261
//-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)