From 389c1f1ad17f078d44536fae796cb9643e1828ba Mon Sep 17 00:00:00 2001 From: Merwan Achibet Date: Tue, 6 Jun 2017 15:40:29 +0200 Subject: [PATCH] Add another batch of missing struct keywords, Add definition for ImDrawVert (#28) * Add missing struct keywords for ImVec2 and ImGuiListClipper arguments * Add another batch of missing struct keywords * Add missing definition for ImDrawVert under CIMGUI_DEFINE_ENUMS_AND_STRUCTS --- cimgui/cimgui.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h index 4c5223b..579f67b 100644 --- a/cimgui/cimgui.h +++ b/cimgui/cimgui.h @@ -242,7 +242,7 @@ struct ImGuiStyle { struct ImVec2 WindowPadding; struct ImVec2 WindowMinSize; float WindowRounding; - ImVec2 WindowTitleAlign; + struct ImVec2 WindowTitleAlign; float ChildWindowRounding; struct ImVec2 FramePadding; float FrameRounding; @@ -255,7 +255,7 @@ struct ImGuiStyle { float ScrollbarRounding; float GrabMinSize; float GrabRounding; - ImVec2 ButtonTextAlign; + struct ImVec2 ButtonTextAlign; struct ImVec2 DisplayWindowPadding; struct ImVec2 DisplaySafeAreaPadding; bool AntiAliasedLines; @@ -280,7 +280,7 @@ struct ImGuiIO { struct ImFontAtlas* Fonts; float FontGlobalScale; bool FontAllowUserScaling; - ImFont* FontDefault; + struct ImFont* FontDefault; struct ImVec2 DisplayFramebufferScale; struct ImVec2 DisplayVisibleMin; struct ImVec2 DisplayVisibleMax; @@ -311,7 +311,7 @@ struct ImGuiIO { int MetricsRenderVertices; int MetricsRenderIndices; int MetricsActiveWindows; - ImVec2 MouseDelta; + struct ImVec2 MouseDelta; struct ImVec2 MousePosPrev; bool MouseClicked[5]; struct ImVec2 MouseClickedPos[5]; @@ -365,6 +365,13 @@ struct ImDrawData { int TotalIdxCount; }; +struct ImDrawVert +{ + struct ImVec2 pos; + struct ImVec2 uv; + ImU32 col; +}; + struct ImFontConfig { void* FontData; int FontDataSize; @@ -374,7 +381,7 @@ struct ImFontConfig { int OversampleH, OversampleV; bool PixelSnapH; struct ImVec2 GlyphExtraSpacing; - ImVec2 GlyphOffset; + struct ImVec2 GlyphOffset; const ImWchar* GlyphRanges; bool MergeMode; char Name[32];