Merge pull request #142 from the-goodies/upstream_master

Fixed BeginPopupV and BeginPopupModalV having incorrect flags type

Popup.go

@@ -36,7 +36,8 @@ const (
 
 // BeginPopupV returns true if the popup is open, and you can start outputting to it.
 // Only call EndPopup() if BeginPopup() returns true.
-func BeginPopupV(name string, flags PopupFlags) bool {
+// WindowFlags are forwarded to the window.
+func BeginPopupV(name string, flags WindowFlags) bool {
 	nameArg, nameFin := wrapString(name)
 	defer nameFin()
 	return C.iggBeginPopup(nameArg, C.int(flags)) != 0
@@ -49,7 +50,8 @@ func BeginPopup(name string) bool {
 
 // BeginPopupModalV creates modal dialog (regular window with title bar, block interactions behind the modal window,
 // can't close the modal window by clicking outside).
-func BeginPopupModalV(name string, open *bool, flags PopupFlags) bool {
+// WindowFlags are forwarded to the window.
+func BeginPopupModalV(name string, open *bool, flags WindowFlags) bool {
 	nameArg, nameFin := wrapString(name)
 	defer nameFin()
 	openArg, openFin := wrapBool(open)

State.go

@@ -260,8 +260,8 @@ const (
 
 // MouseCursor returns desired cursor type, reset in imgui.NewFrame(), this is updated during the frame.
 // Valid before Render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you.
-func MouseCursor() int {
-	return int(C.iggGetMouseCursor())
+func MouseCursor() MouseCursorID {
+	return MouseCursorID(C.iggGetMouseCursor())
 }
 
 // SetMouseCursor sets desired cursor type.

Tables.go

@@ -378,12 +378,12 @@ func TableGetColumnName() string {
 }
 
 // TableGetColumnFlagsV return column flags so you can query their Enabled/Visible/Sorted/Hovered status flags. Pass -1 to use current column.
-func TableGetColumnFlagsV(columnN int) int {
-	return int(C.iggTableGetColumnFlags(C.int(columnN)))
+func TableGetColumnFlagsV(columnN int) TableColumnFlags {
+	return TableColumnFlags(C.iggTableGetColumnFlags(C.int(columnN)))
 }
 
 // TableGetColumnFlags calls TableGetColumnFlagsV(-1).
-func TableGetColumnFlags() int {
+func TableGetColumnFlags() TableColumnFlags {
 	return TableGetColumnFlagsV(-1)
 }
 

Widgets.go

@@ -128,7 +128,7 @@ func ProgressBarV(fraction float32, size Vec2, overlay string) {
 	C.iggProgressBar(C.float(fraction), sizeArg, overlayArg)
 }
 
-// ProgressBar calls ProgressBarV(fraction, Vec2{X: -1, Y: 0}, "").
+// ProgressBar calls ProgressBarV(fraction, Vec2{X: -math.SmallestNonzeroFloat32, Y: 0}, "").
 func ProgressBar(fraction float32) {
 	ProgressBarV(fraction, Vec2{X: -math.SmallestNonzeroFloat32, Y: 0}, "")
 }