Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Columns: Some renaming, extracted code into GetColumnsID().

Browse Source
This commit is contained in:
omar
2019-04-16 11:58:17 +02:00
parent 8130fd9816
commit 311469e9d6
3 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
imgui_widgets.cpp
View File

@ -1209,7 +1209,7 @@ void ImGui::Separator()
}
// Horizontal Separator
if (window->DC.ColumnsSet)
if (window->DC.CurrentColumns)
PopClipRect();
float x1 = window->Pos.x;
@ -1221,7 +1221,7 @@ void ImGui::Separator()
ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
if (!ItemAdd(bb, 0))
{
if (window->DC.ColumnsSet)
if (window->DC.CurrentColumns)
PushColumnClipRect();
return;
}
@ -1231,10 +1231,10 @@ void ImGui::Separator()
if (g.LogEnabled)
LogRenderedText(&bb.Min, "--------------------------------");
if (window->DC.ColumnsSet)
if (window->DC.CurrentColumns)
{
PushColumnClipRect();
window->DC.ColumnsSet->LineMinY = window->DC.CursorPos.y;
window->DC.CurrentColumns->LineMinY = window->DC.CursorPos.y;
}
}
@ -5303,7 +5303,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
ImGuiContext& g = *GImGui;
const ImGuiStyle& style = g.Style;
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.ColumnsSet) // FIXME-OPT: Avoid if vertically clipped.
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns) // FIXME-OPT: Avoid if vertically clipped.
PopClipRect();
ImGuiID id = window->GetID(label);
@ -5347,7 +5347,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
}
if (!item_add)
{
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.ColumnsSet)
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns)
PushColumnClipRect();
return false;
}
@ -5392,7 +5392,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
RenderNavHighlight(bb, id, ImGuiNavHighlightFlags_TypeThin | ImGuiNavHighlightFlags_NoRounding);
}
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.ColumnsSet)
if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns)
{
PushColumnClipRect();
bb.Max.x -= (GetContentRegionMax().x - max_x);