add missing methods from a previous release

Fix Makefile: link ../imgui/imgui_draw.o ../imgui/imgui_demo.o

.gitignore

@@ -33,3 +33,5 @@ cimgui/cimgui.v12.suo
 cimgui/Release/
 .idea
 CMakeLists.txt
+cimgui/.vs/
+cimgui/cimgui.vcxproj.user

README.md

@@ -8,12 +8,12 @@ Most of the functions have wrapper counterparts now, missing stuff is added on a
 This library is intended as a intermediate layer to be able to use imgui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
 
 Notes:
-* currently this wrapper is based on version [1.42 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.42)
+* currently this wrapper is based on version [1.45 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.45)
 * does not compile with pure C compiler yet (for writing bindings in languages that are able to use C-ABI it is enough though, see D-bindings)
 
 # usage
 
 * clone
-* make using makefile on linux/osx (linux makefile not tested)
-* use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig_`
+* make using makefile on linux/osx
+* use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
 * methods have the same parameter list and return values (where possible)

cimgui/Makefile

@@ -7,6 +7,8 @@ OBJS += fontAtlas.o
 OBJS += drawList.o
 #OBJS += test.o
 OBJS += ../imgui/imgui.o
+OBJS += ../imgui/imgui_draw.o
+OBJS += ../imgui/imgui_demo.o
 
 UNAME_S := $(shell uname -s)
 
@@ -40,4 +42,4 @@ imgui_example:$(OBJS)
 	$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)
 
 clean:
-	rm $(OBJS)
+	rm $(OBJS)

cimgui/cimgui.cpp

@@ -12,6 +12,11 @@ CIMGUI_API ImGuiStyle* igGetStyle()
     return &ImGui::GetStyle();
 }
 
+CIMGUI_API ImDrawData* igGetDrawData()
+{
+    return ImGui::GetDrawData();
+}
+
 CIMGUI_API void igNewFrame()
 {
     ImGui::NewFrame();
@@ -84,6 +89,16 @@ CIMGUI_API void igGetContentRegionMax(ImVec2* out)
     *out = ImGui::GetContentRegionMax();
 }
 
+CIMGUI_API void	igGetContentRegionAvail(struct ImVec2* out)
+{
+	*out = ImGui::GetContentRegionAvail();
+}
+
+CIMGUI_API float igGetContentRegionAvailWidth()
+{
+    return ImGui::GetContentRegionAvailWidth();
+}
+
 CIMGUI_API void igGetWindowContentRegionMin(ImVec2* out)
 {
     *out = ImGui::GetWindowContentRegionMin();
@@ -94,6 +109,11 @@ CIMGUI_API void igGetWindowContentRegionMax(ImVec2* out)
     *out = ImGui::GetWindowContentRegionMax();
 }
 
+CIMGUI_API float igGetWindowContentRegionWidth()
+{
+    return ImGui::GetWindowContentRegionWidth();
+}
+
 CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
     return ImGui::GetWindowDrawList();
@@ -129,6 +149,11 @@ CIMGUI_API float igGetWindowWidth()
     return ImGui::GetWindowWidth();
 }
 
+CIMGUI_API float igGetWindowHeight()
+{
+    return ImGui::GetWindowHeight();
+}
+
 CIMGUI_API bool igIsWindowCollapsed()
 {
     return ImGui::IsWindowCollapsed();
@@ -149,6 +174,16 @@ CIMGUI_API void igSetNextWindowSize(CONST ImVec2 size, ImGuiSetCond cond)
     ImGui::SetNextWindowSize(size, cond);
 }
 
+CIMGUI_API void igSetNextWindowContentSize(CONST ImVec2 size)
+{
+    ImGui::SetNextWindowContentSize(size);
+}
+
+CIMGUI_API void igSetNextWindowContentWidth(float width)
+{
+    ImGui::SetNextWindowContentWidth(width);
+}
+
 CIMGUI_API void igSetNextWindowCollapsed(bool collapsed, ImGuiSetCond cond)
 {
     ImGui::SetNextWindowCollapsed(collapsed,cond);
@@ -199,16 +234,31 @@ CIMGUI_API void igSetWindowFocus2(CONST char* name)
     ImGui::SetWindowFocus(name);
 }
 
+CIMGUI_API float igGetScrollX()
+{
+    return ImGui::GetScrollX();
+}
+
 CIMGUI_API float			igGetScrollY()
 {
     return ImGui::GetScrollY();
 }
 
+CIMGUI_API float igGetScrollMaxX()
+{
+    return ImGui::GetScrollMaxX();
+}
+
 CIMGUI_API float			igGetScrollMaxY()
 {
     return ImGui::GetScrollMaxY();
 }
 
+CIMGUI_API void igSetScrollX(float scroll_x)
+{
+    return ImGui::SetScrollX(scroll_x);
+}
+
 CIMGUI_API void             igSetScrollY(float scroll_y)
 {
     return ImGui::SetScrollY(scroll_y);
@@ -402,9 +452,9 @@ CIMGUI_API void				igSeparator()
     return ImGui::Separator();
 }
 
-CIMGUI_API void				igSameLine(float pos_x, float spacing_w)
+CIMGUI_API void				igSameLine(float local_pos_x, float spacing_w)
 {
-    return ImGui::SameLine(pos_x, spacing_w);
+    return ImGui::SameLine(local_pos_x, spacing_w);
 }
 
 CIMGUI_API void				igSpacing()
@@ -477,9 +527,9 @@ CIMGUI_API float			igGetCursorPosY()
     return ImGui::GetCursorPosY();
 }
 
-CIMGUI_API void				igSetCursorPos(CONST ImVec2 pos)
+CIMGUI_API void				igSetCursorPos(CONST ImVec2 local_pos)
 {
-    return ImGui::SetCursorPos(pos);
+    return ImGui::SetCursorPos(local_pos);
 }
 
 CIMGUI_API void				igSetCursorPosX(float x)
@@ -1240,9 +1290,9 @@ CIMGUI_API bool				igIsMouseHoveringAnyWindow()
     return ImGui::IsMouseHoveringAnyWindow();
 }
 
-CIMGUI_API bool				igIsMouseHoveringRect(CONST ImVec2 rect_min, CONST ImVec2 rect_max)
+CIMGUI_API bool				igIsMouseHoveringRect(CONST ImVec2 pos_min, CONST ImVec2 pos_max, bool clip)
 {
-    return ImGui::IsMouseHoveringRect(rect_min,rect_max);
+    return ImGui::IsMouseHoveringRect(pos_min,pos_max,clip);
 }
 
 CIMGUI_API bool				igIsMouseDragging(int button, float lock_threshold)
@@ -1259,6 +1309,11 @@ CIMGUI_API void igGetMousePos(ImVec2* pOut)
     *pOut = ImGui::GetMousePos();
 }
 
+CIMGUI_API void igGetMousePosOnOpeningCurrentPopup(ImVec2* pOut)
+{
+    *pOut = ImGui::GetMousePosOnOpeningCurrentPopup();
+}
+
 CIMGUI_API void igGetMouseDragDelta(ImVec2* pOut, int button, float lock_threshold)
 {
     *pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
@@ -1279,6 +1334,36 @@ CIMGUI_API void				igSetMouseCursor(ImGuiMouseCursor type)
     ImGui::SetMouseCursor(type);
 }
 
+CIMGUI_API void igCaptureKeyboardFromApp()
+{
+    return ImGui::CaptureKeyboardFromApp();
+}
+
+CIMGUI_API void igCaptureMouseFromApp()
+{
+    return ImGui::CaptureMouseFromApp();
+}
+
+CIMGUI_API void* igMemAlloc(size_t sz)
+{
+    return ImGui::MemAlloc(sz);
+}
+
+CIMGUI_API void igMemFree(void* ptr)
+{
+    return ImGui::MemFree(ptr);
+}
+
+CIMGUI_API const char* igGetClipboardText()
+{
+    return ImGui::GetClipboardText();
+}
+
+CIMGUI_API void igSetClipboardText(const char* text)
+{
+    return ImGui::SetClipboardText(text);
+}
+
 CIMGUI_API float			igGetTime()
 {
     return ImGui::GetTime();
@@ -1309,9 +1394,9 @@ CIMGUI_API void				igCalcListClipping(int items_count, float items_height, int*
     ImGui::CalcListClipping(items_count,items_height,out_items_display_start,out_items_display_end);
 }
 
-CIMGUI_API bool				igBeginChildFrame(ImGuiID id, CONST ImVec2 size)
+CIMGUI_API bool				igBeginChildFrame(ImGuiID id, CONST ImVec2 size, ImGuiWindowFlags extra_flags)
 {
-    return ImGui::BeginChildFrame(id, size);
+    return ImGui::BeginChildFrame(id, size, extra_flags);
 }
 
 CIMGUI_API void				igEndChildFrame()
@@ -1319,6 +1404,11 @@ CIMGUI_API void				igEndChildFrame()
     ImGui::EndChildFrame();
 }
 
+CIMGUI_API void igColorConvertU32ToFloat4(ImVec4* pOut, ImU32 in)
+{
+    *pOut = ImGui::ColorConvertU32ToFloat4(in);
+}
+
 CIMGUI_API ImU32			igColorConvertFloat4ToU32(CONST ImVec4 in)
 {
     return ImGui::ColorConvertFloat4ToU32(in);

cimgui/cimgui.h

@@ -25,6 +25,7 @@ typedef int ImGuiColorEditMode;
 
 CIMGUI_API ImGuiIO*         igGetIO();
 CIMGUI_API ImGuiStyle*      igGetStyle();
+CIMGUI_API ImDrawData*      igGetDrawData();
 CIMGUI_API void             igNewFrame();
 CIMGUI_API void             igRender();
 CIMGUI_API void             igShutdown();
@@ -41,8 +42,11 @@ CIMGUI_API bool             igBeginChild(CONST char* str_id, CONST struct ImVec2
 CIMGUI_API bool             igBeginChildEx(ImGuiID id, CONST struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
 CIMGUI_API void             igEndChild();
 CIMGUI_API void             igGetContentRegionMax(struct ImVec2* out);
+CIMGUI_API void             igGetContentRegionAvail(struct ImVec2* out);
+CIMGUI_API float            igGetContentRegionAvailWidth();                                       //
 CIMGUI_API void             igGetWindowContentRegionMin(struct ImVec2* out);
 CIMGUI_API void             igGetWindowContentRegionMax(struct ImVec2* out);
+CIMGUI_API float            igGetWindowContentRegionWidth();                                      //
 CIMGUI_API ImDrawList*      igGetWindowDrawList();
 CIMGUI_API ImFont*          igGetWindowFont();
 CIMGUI_API float            igGetWindowFontSize(); 
@@ -50,11 +54,14 @@ CIMGUI_API void             igSetWindowFontScale(float scale);
 CIMGUI_API void             igGetWindowPos(struct ImVec2* out);
 CIMGUI_API void             igGetWindowSize(struct ImVec2* out);
 CIMGUI_API float            igGetWindowWidth();
+CIMGUI_API float            igGetWindowHeight();
 CIMGUI_API bool             igIsWindowCollapsed();
 
 CIMGUI_API void             igSetNextWindowPos(CONST struct ImVec2 pos, ImGuiSetCond cond);
 CIMGUI_API void             igSetNextWindowPosCenter(ImGuiSetCond cond);
 CIMGUI_API void             igSetNextWindowSize(CONST struct ImVec2 size, ImGuiSetCond cond);
+CIMGUI_API void             igSetNextWindowContentSize(CONST ImVec2 size);
+CIMGUI_API void             igSetNextWindowContentWidth(float width);
 CIMGUI_API void             igSetNextWindowCollapsed(bool collapsed, ImGuiSetCond cond);
 CIMGUI_API void             igSetNextWindowFocus();
 CIMGUI_API void             igSetWindowPos(CONST struct ImVec2 pos, ImGuiSetCond cond);
@@ -66,8 +73,11 @@ CIMGUI_API void             igSetWindowSize2(CONST char* name, CONST struct ImVe
 CIMGUI_API void             igSetWindowCollapsed2(CONST char* name, bool collapsed, ImGuiSetCond cond);
 CIMGUI_API void             igSetWindowFocus2(CONST char* name);
 
+CIMGUI_API float            igGetScrollX();
 CIMGUI_API float            igGetScrollY();
+CIMGUI_API float            igGetScrollMaxX();
 CIMGUI_API float            igGetScrollMaxY();
+CIMGUI_API void             igSetScrollX(float scroll_x);
 CIMGUI_API void             igSetScrollY(float scroll_y);
 CIMGUI_API void             igSetScrollHere(float center_y_ratio = 0.5f);
 CIMGUI_API void             igSetScrollFromPosY(float pos_y, float center_y_ratio = 0.5f);
@@ -88,10 +98,10 @@ CIMGUI_API void             igPopStyleVar(int count);
 CIMGUI_API void             igPushItemWidth(float item_width);
 CIMGUI_API void             igPopItemWidth();
 CIMGUI_API float            igCalcItemWidth();
-CIMGUI_API void             igPushAllowKeyboardFocus(bool v);
-CIMGUI_API void             igPopAllowKeyboardFocus();
 CIMGUI_API void             igPushTextWrapPos(float wrap_pos_x);
 CIMGUI_API void             igPopTextWrapPos();
+CIMGUI_API void             igPushAllowKeyboardFocus(bool v);
+CIMGUI_API void             igPopAllowKeyboardFocus();
 CIMGUI_API void             igPushButtonRepeat(bool repeat);
 CIMGUI_API void             igPopButtonRepeat();
 
@@ -99,7 +109,7 @@ CIMGUI_API void             igPopButtonRepeat();
 CIMGUI_API void             igBeginGroup();
 CIMGUI_API void             igEndGroup();
 CIMGUI_API void             igSeparator();
-CIMGUI_API void             igSameLine(float pos_x, float spacing_w);
+CIMGUI_API void             igSameLine(float local_pos_x, float spacing_w);
 CIMGUI_API void             igSpacing();
 CIMGUI_API void             igDummy(CONST ImVec2* size);
 CIMGUI_API void             igIndent();
@@ -114,7 +124,7 @@ CIMGUI_API int              igGetColumnsCount();
 CIMGUI_API void             igGetCursorPos(struct ImVec2* pOut);
 CIMGUI_API float            igGetCursorPosX();
 CIMGUI_API float            igGetCursorPosY();
-CIMGUI_API void             igSetCursorPos(CONST struct ImVec2 pos);
+CIMGUI_API void             igSetCursorPos(CONST struct ImVec2 local_pos);
 CIMGUI_API void             igSetCursorPosX(float x);
 CIMGUI_API void             igSetCursorPosY(float y);
 CIMGUI_API void             igGetCursorStartPos(struct ImVec2* pOut);
@@ -297,9 +307,10 @@ CIMGUI_API void             igCalcItemRectClosestPoint(struct ImVec2* pOut, CONS
 CIMGUI_API void             igCalcTextSize(struct ImVec2* pOut, CONST char* text, CONST char* text_end, bool hide_text_after_double_hash, float wrap_width);
 CIMGUI_API void             igCalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end);
 
-CIMGUI_API bool             igBeginChildFrame(ImGuiID id, CONST struct ImVec2 size);
+CIMGUI_API bool             igBeginChildFrame(ImGuiID id, CONST struct ImVec2 size, ImGuiWindowFlags extra_flags);
 CIMGUI_API void             igEndChildFrame();
 
+CIMGUI_API void             igColorConvertU32ToFloat4(ImVec4* pOut, ImU32 in);
 CIMGUI_API ImU32            igColorConvertFloat4ToU32(CONST struct ImVec4 in);
 CIMGUI_API void             igColorConvertRGBtoHSV(float r, float g, float b, float* out_h, float* out_s, float* out_v);
 CIMGUI_API void             igColorConvertHSVtoRGB(float h, float s, float v, float* out_r, float* out_g, float* out_b);
@@ -313,13 +324,22 @@ CIMGUI_API bool             igIsMouseDoubleClicked(int button);
 CIMGUI_API bool             igIsMouseReleased(int button);
 CIMGUI_API bool             igIsMouseHoveringWindow();
 CIMGUI_API bool             igIsMouseHoveringAnyWindow();
-CIMGUI_API bool             igIsMouseHoveringRect(CONST struct ImVec2 rect_min, CONST struct ImVec2 rect_max);
+CIMGUI_API bool             igIsMouseHoveringRect(CONST struct ImVec2 pos_min, CONST struct ImVec2 pos_max, bool clip);
 CIMGUI_API bool             igIsMouseDragging(int button, float lock_threshold);
 CIMGUI_API void             igGetMousePos(struct ImVec2* pOut);
+CIMGUI_API void             igGetMousePosOnOpeningCurrentPopup(ImVec2* pOut);
 CIMGUI_API void             igGetMouseDragDelta(struct ImVec2* pOut, int button, float lock_threshold);
 CIMGUI_API void             igResetMouseDragDelta(int button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor();
 CIMGUI_API void             igSetMouseCursor(ImGuiMouseCursor type);
+CIMGUI_API void             igCaptureKeyboardFromApp();
+CIMGUI_API void             igCaptureMouseFromApp();
+
+// Helpers functions to access functions pointers in ImGui::GetIO()
+CIMGUI_API void*            igMemAlloc(size_t sz);
+CIMGUI_API void             igMemFree(void* ptr);
+CIMGUI_API const char*      igGetClipboardText();
+CIMGUI_API void             igSetClipboardText(const char* text);
 
 // Internal state access - if you want to share ImGui state between modules (e.g. DLL) or allocate it yourself
 CIMGUI_API CONST char*      igGetVersion();
@@ -335,6 +355,7 @@ CIMGUI_API ImFont*          ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
+CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API void             ImFontAtlas_ClearTexData(ImFontAtlas* atlas);
 CIMGUI_API void             ImFontAtlas_Clear(ImFontAtlas* atlas);
 

cimgui/cimgui.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -77,11 +77,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\imgui\imgui.cpp" />
+    <ClCompile Include="..\imgui\imgui_demo.cpp" />
+    <ClCompile Include="..\imgui\imgui_draw.cpp" />
     <ClCompile Include="cimgui.cpp" />
     <ClCompile Include="drawList.cpp" />
     <ClCompile Include="fontAtlas.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\imgui\imgui_internal.h" />
     <ClInclude Include="cimgui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

cimgui/cimgui.vcxproj.filters

@@ -27,10 +27,19 @@
     <ClCompile Include="drawList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\imgui\imgui_draw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\imgui\imgui_demo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cimgui.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\imgui\imgui_internal.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

cimgui/fontAtlas.cpp

@@ -42,6 +42,11 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas
 	return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges);
 }
 
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
+{
+	return atlas->AddFontFromMemoryCompressedBase85TTF(compressed_ttf_data_base85, size_pixels, font_cfg, glyph_ranges);
+}
+
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas)
 {
 	return atlas->ClearTexData();