Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Columns: Fix support for BeginColumns() with a count of 1 (not that this isn't available via the old Columns() api). Tweaked Demo to facilitate testing for it.

Browse Source
This commit is contained in:
omar 2019-07-19 12:11:00 -07:00
parent 047dc16af5
commit 493795cdd1
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui_demo.cpp
View File

@ -2590,11 +2590,16 @@ static void ShowDemoWindowColumns()
// NB: Future columns API should allow automatic horizontal borders. // NB: Future columns API should allow automatic horizontal borders.
static bool h_borders = true; static bool h_borders = true;
static bool v_borders = true; static bool v_borders = true;
static int columns_count = 4;
const int lines_count = 3;
ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
ImGui::DragInt("##columns_count", &columns_count, 0.1f, 1, 10, "%d columns");
ImGui::SameLine();
ImGui::Checkbox("horizontal", &h_borders); ImGui::Checkbox("horizontal", &h_borders);
ImGui::SameLine(); ImGui::SameLine();
ImGui::Checkbox("vertical", &v_borders); ImGui::Checkbox("vertical", &v_borders);
ImGui::Columns(4, NULL, v_borders); ImGui::Columns(columns_count, NULL, v_borders);
for (int i = 0; i < 4 * 3; i++) for (int i = 0; i < columns_count * lines_count; i++)
{ {
if (h_borders && ImGui::GetColumnIndex() == 0) if (h_borders && ImGui::GetColumnIndex() == 0)
ImGui::Separator(); ImGui::Separator();

13
imgui_widgets.cpp
View File

@ -7236,6 +7236,8 @@ void ImGui::PushColumnsBackground()
{ {
ImGuiWindow* window = GetCurrentWindowRead(); ImGuiWindow* window = GetCurrentWindowRead();
ImGuiColumns* columns = window->DC.CurrentColumns; ImGuiColumns* columns = window->DC.CurrentColumns;
if (columns->Count == 1)
return;
window->DrawList->ChannelsSetCurrent(0); window->DrawList->ChannelsSetCurrent(0);
int cmd_size = window->DrawList->CmdBuffer.Size; int cmd_size = window->DrawList->CmdBuffer.Size;
PushClipRect(columns->HostClipRect.Min, columns->HostClipRect.Max, false); PushClipRect(columns->HostClipRect.Min, columns->HostClipRect.Max, false);
@ -7247,6 +7249,8 @@ void ImGui::PopColumnsBackground()
{ {
ImGuiWindow* window = GetCurrentWindowRead(); ImGuiWindow* window = GetCurrentWindowRead();
ImGuiColumns* columns = window->DC.CurrentColumns; ImGuiColumns* columns = window->DC.CurrentColumns;
if (columns->Count == 1)
return;
window->DrawList->ChannelsSetCurrent(columns->Current + 1); window->DrawList->ChannelsSetCurrent(columns->Current + 1);
PopClipRect(); PopClipRect();
} }
@ -7294,15 +7298,16 @@ void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlag
columns->Flags = flags; columns->Flags = flags;
window->DC.CurrentColumns = columns; window->DC.CurrentColumns = columns;
columns->HostCursorPosY = window->DC.CursorPos.y;
columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
columns->HostClipRect = window->ClipRect;
columns->HostWorkRect = window->WorkRect;
// Set state for first column // Set state for first column
const float column_padding = g.Style.ItemSpacing.x; const float column_padding = g.Style.ItemSpacing.x;
columns->OffMinX = window->DC.Indent.x - column_padding; columns->OffMinX = window->DC.Indent.x - column_padding;
columns->OffMaxX = window->WorkRect.Max.x - window->Pos.x; columns->OffMaxX = window->WorkRect.Max.x - window->Pos.x;
columns->OffMaxX = ImMax(columns->OffMaxX, columns->OffMinX + 1.0f); columns->OffMaxX = ImMax(columns->OffMaxX, columns->OffMinX + 1.0f);
columns->HostCursorPosY = window->DC.CursorPos.y;
columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
columns->HostClipRect = window->ClipRect;
columns->HostWorkRect = window->WorkRect;
columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y; columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
window->DC.ColumnsOffset.x = 0.0f; window->DC.ColumnsOffset.x = 0.0f;
window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);