Merge pull request #80 from zlianon/master

Add ItemSpacing/FrameHeightWithSpacing

Style.go

@@ -147,6 +147,11 @@ func GetWindowPadding() (float32, float32) {
 	return vec2.X, vec2.Y
 }
 
+func GetItemSpacing() (float32, float32) {
+	vec2 := imgui.CurrentStyle().ItemSpacing()
+	return vec2.X, vec2.Y
+}
+
 func GetItemInnerSpacing() (float32, float32) {
 	vec2 := imgui.CurrentStyle().ItemInnerSpacing()
 	return vec2.X, vec2.Y

imgui/Style.go

@@ -117,6 +117,15 @@ func (style Style) handle() C.IggGuiStyle {
 	return C.IggGuiStyle(style)
 }
 
+// ItemSpacing is the horizontal and vertical spacing between widgets/lines.
+func (style Style) ItemSpacing() Vec2 {
+	var value Vec2
+	valueArg, valueFin := value.wrapped()
+	C.iggStyleGetItemSpacing(style.handle(), valueArg)
+	valueFin()
+	return value
+}
+
 // ItemInnerSpacing is the horizontal and vertical spacing between elements of
 // a composed widget (e.g. a slider and its label).
 func (style Style) ItemInnerSpacing() Vec2 {

imgui/StyleWrapper.cpp

@@ -2,6 +2,12 @@
 #include "StyleWrapper.h"
 #include "WrapperConverter.h"
 
+void iggStyleGetItemSpacing(IggGuiStyle handle, IggVec2 *value)
+{
+   ImGuiStyle *style = reinterpret_cast<ImGuiStyle *>(handle);
+   exportValue(*value, style->ItemSpacing);
+}
+
 void iggStyleGetItemInnerSpacing(IggGuiStyle handle, IggVec2 *value)
 {
    ImGuiStyle *style = reinterpret_cast<ImGuiStyle *>(handle);

imgui/StyleWrapper.h

@@ -7,6 +7,8 @@ extern "C"
 {
 #endif
 
+extern void iggStyleGetItemSpacing(IggGuiStyle handle, IggVec2 *value);
+
 extern void iggStyleGetItemInnerSpacing(IggGuiStyle handle, IggVec2 *value);
 
 extern void iggStyleGetWindowPadding(IggGuiStyle handle, IggVec2 *value);

imgui/imgui.go

@@ -790,6 +790,11 @@ func TextLineHeightWithSpacing() float32 {
 	return float32(C.iggGetTextLineHeightWithSpacing())
 }
 
+// FrameHeightWithSpacing return ~ FontSize + style.FramePadding.y * 2.0f + style.ItemSpacing.y;
+func FrameHeightWithSpacing() float32 {
+	return float32(C.iggFrameHeightWithSpacing())
+}
+
 // TreeNodeV returns true if the tree branch is to be rendered. Call TreePop() in this case.
 func TreeNodeV(label string, flags int) bool {
 	labelArg, labelFin := wrapString(label)

imgui/imguiWrapper.cpp

@@ -518,6 +518,11 @@ float iggGetTextLineHeightWithSpacing(void)
    return ImGui::GetTextLineHeightWithSpacing();
 }
 
+float iggFrameHeightWithSpacing(void)
+{
+   return ImGui::GetFrameHeightWithSpacing();
+}
+
 IggBool iggTreeNode(char const *label, int flags)
 {
    return ImGui::TreeNodeEx(label, flags) ? 1 : 0;

imgui/imguiWrapper.h

@@ -148,6 +148,7 @@ extern void iggMousePos(IggVec2 *pos);
 extern void iggAlignTextToFramePadding();
 extern float iggGetTextLineHeight(void);
 extern float iggGetTextLineHeightWithSpacing(void);
+extern float iggFrameHeightWithSpacing(void);
 
 extern IggBool iggTreeNode(char const *label, int flags);
 extern void iggTreePop(void);