- fixed downstream flag format

- layout
- finished a renaming from a native commit
- fixed demo bugs:
    - char printing
    - a misplaced `treePop`
    - wrong condition on some `menuItem`s
    - adding missing `ListBoxes` in `ShowDemoWindowWidgets`
- fixed `textCharToUtf8`
- expanding and amending `textCharToUtf8Inline` with pointer and size

Author: elect86

core/src/main/kotlin/imgui/api/demoDebugInformations.kt

@@ -264,7 +264,7 @@ interface demoDebugInformations {
                             for (columnN in 0 until table.columnsCount) {
                                 val r = Funcs.getTableRect(table, rectN, columnN)
                                 val buf = "(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) Col $columnN ${rectN.name}"
-                                        .format(r.min.x, r.min.y, r.max.x, r.max.y, r.width, r.height)
+                                    .format(r.min.x, r.min.y, r.max.x, r.max.y, r.width, r.height)
                                 selectable(buf)
                                 if (isItemHovered())
                                     foregroundDrawList.addRect(r.min - 1, r.max + 1, COL32(255, 255, 0, 255), thickness = 2f)
@@ -758,19 +758,16 @@ interface demoDebugInformations {
                 if (io.configInputTextCursorBlink) text("io.configInputTextCursorBlink")
                 if (io.configWindowsResizeFromEdges) text("io.configWindowsResizeFromEdges")
                 if (io.configWindowsMoveFromTitleBarOnly) text("io.configWindowsMoveFromTitleBarOnly")
-                if (io.configMemoryCompactTimer >= 0f) text("io.ConfigMemoryCompactTimer = %.1f",
-                                                            io.configMemoryCompactTimer)
+                if (io.configMemoryCompactTimer >= 0f) text("io.ConfigMemoryCompactTimer = %.1f", io.configMemoryCompactTimer)
                 text("io.backendFlags: 0x%08X", io.backendFlags)
                 if (io.backendFlags has BackendFlag.HasGamepad) text(" HasGamepad")
                 if (io.backendFlags has BackendFlag.HasMouseCursors) text(" HasMouseCursors")
                 if (io.backendFlags has BackendFlag.HasSetMousePos) text(" HasSetMousePos")
                 if (io.backendFlags has BackendFlag.RendererHasVtxOffset) text(" RendererHasVtxOffset") // @formatter:on
                 separator()
-                text("io.fonts: ${io.fonts.fonts.size} fonts, Flags: 0x%08X, TexSize: ${io.fonts.texSize.x},${io.fonts.texSize.y}",
-                     io.fonts.flags)
+                text("io.fonts: ${io.fonts.fonts.size} fonts, Flags: 0x%08X, TexSize: ${io.fonts.texSize.x},${io.fonts.texSize.y}", io.fonts.flags)
                 text("io.displaySize: ${io.displaySize.x},${io.displaySize.y}")
-                text("io.displayFramebufferScale: %.2f,%.2f".format(io.displayFramebufferScale.x,
-                                                                    io.displayFramebufferScale.y))
+                text("io.displayFramebufferScale: %.2f,%.2f".format(io.displayFramebufferScale.x, io.displayFramebufferScale.y))
                 separator()
                 text("style.windowPadding: %.2f,%.2f", style.windowPadding.x, style.windowPadding.y)
                 text("style.windowBorderSize: %.2f", style.windowBorderSize)

core/src/main/kotlin/imgui/api/widgetsSliders.kt

@@ -24,6 +24,7 @@ import imgui.internal.sections.ItemFlag
 import imgui.internal.sections.ItemStatusFlag
 import kool.getValue
 import kool.setValue
+import java.lang.Exception
 import kotlin.reflect.KMutableProperty0
 
 // Widgets: Regular Sliders
@@ -90,7 +91,8 @@ interface widgetsSliders {
 
         val tempInputAllowed = flags hasnt SliderFlag.NoInput
         ImGui.itemSize(totalBb, ImGui.style.framePadding.y)
-        if (!ImGui.itemAdd(totalBb, id, frameBb, if (tempInputAllowed) ItemFlag.Inputable else none)) return false
+        if (!ImGui.itemAdd(totalBb, id, frameBb, if (tempInputAllowed) ItemFlag.Inputable else none))
+            return false
 
         // Default format string when passing NULL
         val format = format_ ?: defaultFormat

core/src/main/kotlin/imgui/demo/DemoWindow.kt

@@ -185,7 +185,7 @@ object DemoWindow {
             //if (ImGui::MenuItem("MenuItem")) {} // You can also use MenuItem() inside a menu bar!
             menu("Tools") {
 
-                val hasDebugTools = IMGUI_DISABLE_DEBUG_TOOLS
+                val hasDebugTools = !IMGUI_DISABLE_DEBUG_TOOLS
 
                 menuItem("Metrics/Debugger", "", show::metrics, hasDebugTools)
                 menuItem("Debug Log", "", show::debugLog, hasDebugTools)

core/src/main/kotlin/imgui/demo/ShowDemoWindowWidgets.kt

@@ -223,6 +223,7 @@ object ShowDemoWindowWidgets {
         Text()
         Images()
         Combo()
+        ListBoxes()
         Selectables()
         `Text Input`()
         Tabs()

core/src/main/kotlin/imgui/demo/showExampleApp/StyleEditor.kt

@@ -130,8 +130,7 @@ object StyleEditor {
         sameLine()
         if (button("Revert Ref")) g.style = ref!!
         sameLine()
-        helpMarker(
-                "Save/Revert in local non-persistent storage. Default Colors definition are not affected. " + "Use \"Export\" below to save them somewhere.")
+        helpMarker("Save/Revert in local non-persistent storage. Default Colors definition are not affected. " + "Use \"Export\" below to save them somewhere.")
 
         separator()
 
@@ -166,7 +165,7 @@ object StyleEditor {
                 slider("GrabRounding", style::grabRounding, 0f, 12f, "%.0f")
                 slider("TabRounding", style::tabRounding, 0f, 12f, "%.0f")
 
-                separatorText("Alignment")
+                separatorText("Widgets")
                 slider2("WindowTitleAlign", style.windowTitleAlign, 0f, 1f, "%.2f")
                 run {
                     val sideRef = (style.windowMenuButtonPosition.i + 1).mutableReference
@@ -185,10 +184,9 @@ object StyleEditor {
                 sameLine(); helpMarker("Alignment applies when a button is larger than its text content.")
                 slider2("SelectableTextAlign", style.selectableTextAlign, 0f, 1f, "%.2f")
                 sameLine(); helpMarker("Alignment applies when a selectable is larger than its text content.")
-
                 slider("SeparatorTextBorderSize", style::separatorTextBorderSize, 0f, 10f, "%.0f")
                 slider2("SeparatorTextAlign", style.separatorTextAlign, 0f, 1f, "%.2f")
-                slider2("SeparatorTextPadding", style.separatorTextPadding, 0f, 40f, "%0.f")
+                slider2("SeparatorTextPadding", style.separatorTextPadding, 0f, 40f, "%.0f")
                 slider("LogSliderDeadzone", style::logSliderDeadzone, 0f, 12f, "%.0f")
 
                 separatorText("Misc")
@@ -205,9 +203,8 @@ object StyleEditor {
                     for (i in Col.values()) {
                         val col = style.colors[i]
                         val name = i.name
-                        if (!outputOnlyModified || col != ref!!.colors[i]) logText(
-                                "colors[Col_$name]%s = Vec4(%.2f, %.2f, %.2f, %.2f)\n", " ".repeat(23 - name.length), col.x,
-                                col.y, col.z, col.w)
+                        if (!outputOnlyModified || col != ref!!.colors[i])
+                            logText("colors[Col_$name]%s = Vec4(%.2f, %.2f, %.2f, %.2f)\n", " ".repeat(23 - name.length), col.x, col.y, col.z, col.w)
                     }
                     logFinish()
                 }
@@ -222,19 +219,13 @@ object StyleEditor {
 
                 radioButton("Opaque", alphaFlags.isEmpty) { alphaFlags = none }; sameLine()
                 radioButton("Alpha", alphaFlags == Cef.AlphaPreview) { alphaFlags = Cef.AlphaPreview }; sameLine()
-                radioButton("Both", alphaFlags == Cef.AlphaPreviewHalf) {
-                    alphaFlags = Cef.AlphaPreviewHalf
-                }; sameLine()
+                radioButton("Both", alphaFlags == Cef.AlphaPreviewHalf) { alphaFlags = Cef.AlphaPreviewHalf }; sameLine()
                 helpMarker("""
                     In the color list:
                     Left-click on color square to open color picker,
-                    Right-click to open edit options menu.""".trimIndent()
-                )
+                    Right-click to open edit options menu.""".trimIndent())
 
-                child(
-                        "#colors", Vec2(), true,
-                        Wf.AlwaysVerticalScrollbar or Wf.AlwaysHorizontalScrollbar or Wf._NavFlattened
-                ) {
+                child("#colors", Vec2(), true, Wf.AlwaysVerticalScrollbar or Wf.AlwaysHorizontalScrollbar or Wf._NavFlattened) {
                     withItemWidth(-160) {
                         for (i in 0 until Col.COUNT) {
                             val name = Col.values()[i].name
@@ -314,7 +305,7 @@ object StyleEditor {
                             val segmentCount = drawList._calcCircleAutoSegmentCount(rad)
 
                             group {
-                                text("R: %.f\nN: ${drawList._calcCircleAutoSegmentCount(rad)}", rad)
+                                text("R: %.0f\nN: ${drawList._calcCircleAutoSegmentCount(rad)}", rad)
 
                                 val canvasWidth = minWidgetWidth max (rad * 2f)
                                 val offsetX = floor(canvasWidth * 0.5f)
@@ -350,9 +341,7 @@ object StyleEditor {
 
     fun debugNodeFont(font: Font) {
         val name = font.configData.getOrNull(0)?.name ?: ""
-        val fontDetailsOpened = treeNode(font,
-                "Font \\\"$name\\\"\\n%.2f px, %.2f px, ${font.glyphs.size} glyphs, ${font.configDataCount} file(s)",
-                font.fontSize)
+        val fontDetailsOpened = treeNode(font, "Font \\\"$name\\\"\\n%.2f px ${font.glyphs.size} glyphs, ${font.configDataCount} file(s)", font.fontSize)
         sameLine(); smallButton("Set as default") { io.fontDefault = font }
         if (!fontDetailsOpened)
             return
@@ -374,15 +363,13 @@ object StyleEditor {
                         |(Glimmer of hope: the atlas system should hopefully be rewritten in the future to make scaling more natural and automatic.)""".trimMargin())
         text("Ascent: ${font.ascent}, Descent: ${font.descent}, Height: ${font.ascent - font.descent}")
         val cStr = ByteArray(5)
-        text("Fallback character: '${textCharToUtf8(cStr, font.fallbackChar.code)}' (U+%04X)", font.fallbackChar)
-        text("Ellipsis character: '${textCharToUtf8(cStr, font.ellipsisChar.code)}' (U+%04X)", font.ellipsisChar)
+        text("Fallback character: '${textCharToUtf8(cStr, font.fallbackChar)}' (U+%04X)", font.fallbackChar.code)
+        text("Ellipsis character: '${textCharToUtf8(cStr, font.ellipsisChar)}' (U+%04X)", font.ellipsisChar.code)
         val side = sqrt(font.metricsTotalSurface.f).i
         text("Texture Area: about ${font.metricsTotalSurface} px ~${side}x$side px")
         for (c in 0 until font.configDataCount)
             font.configData.getOrNull(c)?.let {
-                bulletText(
-                        "Input $c: '${it.name}', Oversample: ${it.oversample}, PixelSnapH: ${it.pixelSnapH}, Offset: (%.1f,%.1f)",
-                        it.glyphOffset.x, it.glyphOffset.y)
+                bulletText("Input $c: '${it.name}', Oversample: ${it.oversample}, PixelSnapH: ${it.pixelSnapH}, Offset: (%.1f,%.1f)", it.glyphOffset.x, it.glyphOffset.y)
             }
 
         // Display all glyphs of the fonts in separate pages of 256 characters
@@ -409,7 +396,7 @@ object StyleEditor {
                     val drawList = windowDrawList
                     for (n in 0 until 256) {
                         val cellP1 = Vec2(basePos.x + (n % 16) * (cellSize + cellSpacing),
-                                basePos.y + (n / 16) * (cellSize + cellSpacing))
+                                          basePos.y + (n / 16) * (cellSize + cellSpacing))
                         val cellP2 = Vec2(cellP1.x + cellSize, cellP1.y + cellSize)
                         val glyph = font.findGlyphNoFallback((base + n).c)
                         drawList.addRect(cellP1, cellP2, COL32(255, 255, 255, if (glyph != null) 100 else 50)) // We use ImFont::RenderChar as a shortcut because we don't have UTF-8 conversion functions
@@ -432,7 +419,7 @@ object StyleEditor {
                 }
                 base += 256
             }
-            treePop()
         }
+        treePop()
     }
 }

core/src/main/kotlin/imgui/internal/api/debugTools.kt

@@ -433,8 +433,8 @@ internal interface debugTools {
                     "(Glimmer of hope: the atlas system will be rewritten in the future to make scaling more flexible.)")
         text("Ascent: ${font.ascent}, Descent: ${font.descent}, Height: ${font.ascent - font.descent}")
         val cStr = ByteArray(5)
-        text("Fallback character: '${textCharToUtf8(cStr, font.fallbackChar.code).cStr}' (U+%04X)", font.fallbackChar)
-        text("Ellipsis character: '${textCharToUtf8(cStr, font.ellipsisChar.code)}' (U+%04X)", font.ellipsisChar)
+        text("Fallback character: '${textCharToUtf8(cStr, font.fallbackChar)}' (U+%04X)", font.fallbackChar.code)
+        text("Ellipsis character: '${textCharToUtf8(cStr, font.ellipsisChar)}' (U+%04X)", font.ellipsisChar.code)
         val surfaceSqrt = sqrt(font.metricsTotalSurface.f).i
         text("Texture Area: about ${font.metricsTotalSurface} px ~${surfaceSqrt}x$surfaceSqrt px")
         for (configI in 0 until font.configDataCount)

core/src/main/kotlin/imgui/internal/api/templateFunctions.kt

@@ -437,8 +437,11 @@ internal interface templateFunctions {
     }
 }
 
+
+// ~SliderScalarN
 inline fun widgetN(label: String, components: Int, widgets: (Int) -> Boolean): Boolean {
-    if (currentWindow.skipItems) return false
+    if (currentWindow.skipItems)
+        return false
 
     var valueChanged = false
     group {

core/src/main/kotlin/imgui/internal/generic helpers.kt

@@ -255,7 +255,7 @@ val Char.isBlankW: Boolean
 // -----------------------------------------------------------------------------------------------------------------
 
 fun formatString(buf: ByteArray, fmt: String, vararg args: Any): Int {
-    val bytes = fmt.format(*args).toByteArray()
+    val bytes = fmt.format(*args.map { if (it is Flag<*>) it.i else it }.toTypedArray()).toByteArray()
     bytes.copyInto(buf) // TODO IndexOutOfBoundsException?
     return bytes.size.also { w -> buf[w] = 0 }
 }
@@ -379,53 +379,53 @@ fun parseFormatPrecision(fmt: String, defaultPrecision: Int): Int {
 // -----------------------------------------------------------------------------------------------------------------
 
 /* return out_buf */
-fun textCharToUtf8(outBuf: ByteArray, c: Int): ByteArray {
-    val count = textCharToUtf8Inline(outBuf, 5, c)
+fun textCharToUtf8(outBuf: ByteArray, c: Char): String {
+    val count = textCharToUtf8Inline(outBuf, size = 5, c = c.code)
     outBuf[count] = 0
-    return outBuf
+    return outBuf.cStr
 }
 
 /** return output UTF-8 bytes count */
 fun textStrToUtf8(outBuf: ByteArray, text: CharArray): Int {
-    var b = 0
+    var bufP = 0
     var t = 0
-    while (b < outBuf.size && t < text.size && text[t] != NUL) {
+    while (bufP < outBuf.size && t < text.size && text[t] != NUL) {
         val c = text[t++].code
         if (c < 0x80)
-            outBuf[b++] = c.b
+            outBuf[bufP++] = c.b
         else
-            b += textCharToUtf8Inline(outBuf, b, c)
+            bufP += textCharToUtf8Inline(outBuf, ptr = bufP, c = c)
     }
-    if (b < outBuf.size) outBuf[b] = 0
-    return b
+    if (bufP < outBuf.size) outBuf[bufP] = 0
+    return bufP
 }
 
 /** Based on stb_to_utf8() from github.com/nothings/stb/
  *  ~ImTextCharToUtf8   */
-fun textCharToUtf8Inline(buf: ByteArray, b: Int, c: Int): Int {
+fun textCharToUtf8Inline(buf: ByteArray, ptr: Int = 0, size: Int = buf.size, c: Int): Int {
     if (c < 0x80) {
-        buf[b + 0] = c.b
+        buf[ptr + 0] = c.b
         return 1
     }
     if (c < 0x800) {
-        if (buf.size < b + 2) return 0
-        buf[b + 0] = (0xc0 + (c ushr 6)).b
-        buf[b + 1] = (0x80 + (c and 0x3f)).b
+        if (size < ptr + 2) return 0
+        buf[ptr + 0] = (0xc0 + (c ushr 6)).b
+        buf[ptr + 1] = (0x80 + (c and 0x3f)).b
         return 2
     }
     if (c < 0x10000) {
-        if (buf.size < 3) return 0
-        buf[b + 0] = (0xe0 + (c ushr 12)).b
-        buf[b + 1] = (0x80 + ((c ushr 6) and 0x3f)).b
-        buf[b + 2] = (0x80 + (c and 0x3f)).b
+        if (size < 3) return 0
+        buf[ptr + 0] = (0xe0 + (c ushr 12)).b
+        buf[ptr + 1] = (0x80 + ((c ushr 6) and 0x3f)).b
+        buf[ptr + 2] = (0x80 + (c and 0x3f)).b
         return 3
     }
     if (c <= 0x10FFFF) {
-        if (buf.size < b + 4) return 0
-        buf[b + 0] = (0xf0 + (c ushr 18)).b
-        buf[b + 1] = (0x80 + ((c ushr 12) and 0x3f)).b
-        buf[b + 2] = (0x80 + ((c ushr 6) and 0x3f)).b
-        buf[b + 3] = (0x80 + (c and 0x3f)).b
+        if (size < ptr + 4) return 0
+        buf[ptr + 0] = (0xf0 + (c ushr 18)).b
+        buf[ptr + 1] = (0x80 + ((c ushr 12) and 0x3f)).b
+        buf[ptr + 2] = (0x80 + ((c ushr 6) and 0x3f)).b
+        buf[ptr + 3] = (0x80 + (c and 0x3f)).b
         return 4
     }
     // Invalid code point, the max unicode is 0x10FFFF