mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_glfw.cpp
This commit is contained in:
commit
935938bbd9
7 changed files with 1590 additions and 1348 deletions
|
|
@ -3178,7 +3178,7 @@ struct IMGUI_API ImGuiTableTempData
|
|||
ImGuiTableTempData() { memset(this, 0, sizeof(*this)); LastTimeActive = -1.0f; }
|
||||
};
|
||||
|
||||
// sizeof() ~ 12
|
||||
// sizeof() ~ 16
|
||||
struct ImGuiTableColumnSettings
|
||||
{
|
||||
float WidthOrWeight;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue