Merge branch 'docking_inter'

This commit is contained in:
Victor Bombi
2020-10-03 16:35:53 +02:00
2 changed files with 28 additions and 15 deletions

View File

@@ -824,32 +824,32 @@ struct ImGuiOnceUponAFrame
{
int RefFrame;
};
struct ImGuiTextRange
{
const char* b;
const char* e;
};
struct ImGuiTextFilter
{
char InputBuf[256];
ImVector_ImGuiTextRange Filters;
int CountGrep;
};
struct ImGuiTextRange
{
const char* b;
const char* e;
};
struct ImGuiTextBuffer
{
ImVector_char Buf;
};
struct ImGuiStoragePair
{
ImGuiID key;
union { int val_i; float val_f; void* val_p; };
};
struct ImGuiStorage
{
ImVector_ImGuiStoragePair Data;
};
typedef struct ImVector_ImGuiTabBar {int Size;int Capacity;ImGuiTabBar* Data;} ImVector_ImGuiTabBar;
typedef struct ImPool_ImGuiTabBar {ImVector_ImGuiTabBar Buf;ImGuiStorage Map;ImPoolIdx FreeIdx;} ImPool_ImGuiTabBar;
struct ImGuiStoragePair
{
ImGuiID key;
union { int val_i; float val_f; void* val_p; };
};
struct ImGuiListClipper
{
int DisplayStart, DisplayEnd;