Merge branch 'viewport' into docking

# Conflicts:
#	docs/TODO.txt
This commit is contained in:
omar
2019-01-15 15:14:16 +01:00
4 changed files with 22 additions and 17 deletions

View File

@ -377,12 +377,14 @@ enum ImGuiItemStatusFlags_
};
// FIXME: this is in development, not exposed/functional as a generic feature yet.
// Horizontal/Vertical enums are fixed to 0/1 so they may be used to index ImVec2
enum ImGuiLayoutType_
{
ImGuiLayoutType_Vertical = 0,
ImGuiLayoutType_Horizontal = 1
ImGuiLayoutType_Horizontal = 0,
ImGuiLayoutType_Vertical = 1
};
// X/Y enums are fixed to 0/1 so they may be used to index ImVec2
enum ImGuiAxis
{
ImGuiAxis_None = -1,