- added TabBarPool::indices

- adding support for Flag parsing in `bulletText`
- fixed missing spread operator in `treeNodeEx`
- removed legacy code from `TableSortSpecs`
- removed misplaced `treePop`
- fixed `radioButton` label casing

Author: elect86

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

@@ -338,9 +338,8 @@ interface demoDebugInformations {
 
         // Details for TabBars
         treeNode("TabBars", "Tab Bars (${g.tabBars.size})") {
-            for (n in 0 until g.tabBars.size)
+            for (n in g.tabBars.indices)
                 debugNodeTabBar(g.tabBars[n]!!, "TabBar")
-
         }
 
         treeNode("Tables", "Tables (${g.tables.size})") {

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

@@ -4,6 +4,7 @@ import glm_.max
 import glm_.vec2.Vec2
 import glm_.vec4.Vec4
 import imgui.Col
+import imgui.Flag
 import imgui.ImGui.calcItemWidth
 import imgui.ImGui.calcTextSize
 import imgui.ImGui.currentWindow
@@ -111,7 +112,7 @@ interface widgetsText {
         if (window.skipItems)
             return
 
-        val text = fmt.format(style.locale, *args)
+        val text = fmt.format(style.locale, *args.map { if (it is Flag<*>) it.i else it }.toTypedArray())
         val labelSize = calcTextSize(text, hideTextAfterDoubleHash = false)
         val totalSize = Vec2(g.fontSize + if (labelSize.x > 0f) (labelSize.x + style.framePadding.x * 2) else 0f, labelSize.y)  // Empty text doesn't add padding
         val pos = Vec2(window.dc.cursorPos)

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

@@ -58,7 +58,7 @@ interface widgetsTrees {
         val window = currentWindow
         if (window.skipItems) return false
 
-        val labelEnd = formatStringToTempBuffer(fmt, args)
+        val labelEnd = formatStringToTempBuffer(fmt, *args)
         return treeNodeBehavior(window.getID(strID), flags, g.tempBuffer, labelEnd)
     }
 

core/src/main/kotlin/imgui/classes/misc.kt

@@ -131,9 +131,6 @@ class TableColumnSortSpecs {
 class TableSortSpecs {
     /** Pointer to sort spec array. */
     var specs = ArrayList<TableColumnSortSpecs>()
-    fun specs(n: Int) = specsArray[specsPtr + n]
-    lateinit var specsArray: Array<TableColumnSortSpecs>
-    var specsPtr = 0
 
     /** Sort spec count. Most often 1. May be > 1 when ImGuiTableFlags_SortMulti is enabled. May be == 0 when ImGuiTableFlags_SortTristate is enabled. */
     var specsCount = 0

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

@@ -203,7 +203,7 @@ object ShowDemoWindowTables {
                 for (n in 0 until currentSortSpecs!!.specsCount) {
                     // Here we identify columns using the ColumnUserID value that we ourselves passed to TableSetupColumn()
                     // We could also choose to identify columns based on their index (sort_spec->ColumnIndex), which is simpler!
-                    val sortSpec = currentSortSpecs!!.specs(n)
+                    val sortSpec = currentSortSpecs!!.specs[n]
                     val delta = when (sortSpec.columnUserID) {
                         MyItemColumnID.ID.ordinal -> a.id - b.id
                         MyItemColumnID.Name.ordinal -> a.name.compareTo(b.name)
@@ -1798,7 +1798,6 @@ object ShowDemoWindowTables {
                             text(": DrawCmd: +${tableDrawListDrawCmdCount - 1} (in child window), Scroll: (%.f/%.f) (%.f/%.f)",
                                  tableScrollCur.x, tableScrollMax.x, tableScrollCur.y, tableScrollMax.y)
                     }
-                treePop()
             }
         }
     }

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

@@ -84,7 +84,7 @@ internal interface color {
         if (allowOptInputs) {
             if (radioButton("RGB", opts has Cef.DisplayRGB)) opts = (opts wo Cef._DisplayMask) or Cef.DisplayRGB
             if (radioButton("HSV", opts has Cef.DisplayHSV)) opts = (opts wo Cef._DisplayMask) or Cef.DisplayHSV
-            if (radioButton("HEX", opts has Cef.DisplayHEX)) opts = (opts wo Cef._DisplayMask) or Cef.DisplayHEX
+            if (radioButton("Hex", opts has Cef.DisplayHEX)) opts = (opts wo Cef._DisplayMask) or Cef.DisplayHEX
         }
         if (allowOptDatatype) {
             if (allowOptInputs) separator()

core/src/main/kotlin/imgui/internal/classes/misc.kt

@@ -557,13 +557,14 @@ value class PoolIdx(val i: Int) {
 }
 
 class TabBarPool {
+    val indices get() = list.indices
     /** Contiguous data */
     val list = ArrayList<TabBar?>()
 
     /** ID->Index */
     val map = mutableMapOf<ID, PoolIdx>()
 
-    /** ~GetByKey */
+    /** ~GetByKey/~TryGetMapData */
     operator fun get(key: ID): TabBar? = map[key]?.let { list[it.i] }
 
     /** ~GetByIndex */