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

Merge branch 'master' into navigation + merge fix

Browse Source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2017-12-07 16:42:52 +01:00
parent 6deb865f78 3c9f9a455e
commit e6215b6ca0
4 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
imgui_internal.h
View File

@ -260,7 +260,8 @@ enum ImGuiDir
ImGuiDir_Left = 0,
ImGuiDir_Right = 1,
ImGuiDir_Up = 2,
ImGuiDir_Down = 3
ImGuiDir_Down = 3,
ImGuiDir_Count_
};
enum ImGuiNavHighlightFlags_
@ -821,7 +822,7 @@ struct IMGUI_API ImGuiWindow
int AutoFitFramesX, AutoFitFramesY;
bool AutoFitOnlyGrows;
int AutoFitChildAxises;
int AutoPosLastDirection;
ImGuiDir AutoPosLastDirection;
int HiddenFrames;
ImGuiCond SetWindowPosAllowFlags; // store condition flags for next SetWindowPos() call.
ImGuiCond SetWindowSizeAllowFlags; // store condition flags for next SetWindowSize() call.