fixed small rounding deviance in columns

Author: elect86

imgui.ini

@@ -1,10 +1,15 @@
 [Debug]
 Pos=60,60
-Size=507.0,355.0
+Size=400.0,400.0
 Collapsed=0
 
 [ImGui Demo]
-Pos=650,20
+Pos=647,22
 Size=550.0,680.0
 Collapsed=0
 
+[Style Editor]
+Pos=390,21
+Size=640.0,688.0
+Collapsed=0
+

src/main/kotlin/imgui/helpers.kt

@@ -88,7 +88,7 @@ class Storage {
 
     fun clear() = data.clear()
 
-    fun intaaaaa(key: Int, defaultVal: Int = 0) = data[key] ?: defaultVal // TODO rename back
+    fun intaaaaaaaaa(key: Int, defaultVal: Int = 0) = data[key] ?: defaultVal // TODO rename back
 
     operator fun set(key: Int, value: Int) {
         data[key] = value

src/main/kotlin/imgui/imgui/colums.kt

@@ -106,8 +106,7 @@ interface imgui_colums {
 
         assert(columnIndex < window.dc.columnsData.size)
         val t = window.dc.columnsData[columnIndex].offsetNorm
-        val xOffset = lerp(window.dc.columnsMinX, window.dc.columnsMaxX, t)
-        return xOffset.i.f
+        return lerp(window.dc.columnsMinX, window.dc.columnsMaxX, t) // xOffset
     }
 
     /** set position of column line (in pixels, from the left side of the contents region). pass -1 to use current column  */

src/main/kotlin/imgui/imgui/demoDebugInfo.kt

@@ -527,7 +527,7 @@ interface imgui_demoDebugInfo {
                 }
                 offset += 3
                 treeNode("In columns") {
-                    columns(3, "", false)
+                    columns(3, null, false)
                     for (i in 0..15) {
                         if (selectable("Item $i", selected, offset + i)) Unit
                         nextColumn()
@@ -1967,7 +1967,7 @@ interface imgui_demoDebugInfo {
         }
 
         val fontsOpened = treeNode("Fonts", "Fonts (${IO.fonts.fonts.size})")
-        sameLine(); showHelpMarker("Tip: Load fonts with io.Fonts->AddFontFromFileTTF()\nbefore calling io.Fonts->GetTex* functions.")
+        sameLine(); showHelpMarker("Tip: Load fonts with IO.fonts.addFontFromFileTTF()\nbefore calling IO.fonts.getTex* functions.")
         if (fontsOpened) {
             val atlas = IO.fonts
             treeNode("Atlas texture", "Atlas texture (${atlas.texSize.x}x${atlas.texSize.y} pixels)") {

src/main/kotlin/imgui/imgui/internal.kt

@@ -16,6 +16,7 @@ import imgui.ImGui.calcItemWidth
 import imgui.ImGui.calcTextSize
 import imgui.ImGui.colorButton
 import imgui.ImGui.contentRegionMax
+import imgui.ImGui.end
 import imgui.ImGui.endChildFrame
 import imgui.ImGui.endGroup
 import imgui.ImGui.endTooltip
@@ -122,7 +123,7 @@ interface imgui_internal {
             if (!it.accessed) it.active = false
         }
 
-        ImGui.end()
+        end()
 
         // Click to focus window and start moving (after we're done with all our widgets)
         if (g.activeId == 0 && g.hoveredId == 0 && IO.mouseClicked[0]) {
@@ -175,8 +176,7 @@ interface imgui_internal {
     }
 
     fun keepAliveId(id: Int) {
-        if (g.activeId == id)
-            g.activeIdIsAlive = true
+        if (g.activeId == id) g.activeIdIsAlive = true
     }
 
     /** Advance cursor given item size for layout.  */
@@ -335,7 +335,7 @@ interface imgui_internal {
     /** setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns().    */
     fun beginColumns(id: String?, columnsCount: Int, flags: Int) {
 
-        with(ImGui.currentWindow) {
+        with(currentWindow) {
 
             assert(columnsCount > 1)
             assert(dc.columnsCount == 1) // Nested columns are currently not supported
@@ -365,11 +365,11 @@ interface imgui_internal {
             dc.cursorPos.x = (pos.x + dc.indentX + dc.columnsOffsetX).i.f
 
             // Cache column offsets
-            dc.columnsData.add(ColumnData())
+            for (i in 0..columnsCount) dc.columnsData.add(ColumnData())
             for (columnIndex in 0..columnsCount) {
 
                 val columnId = dc.columnsSetId + columnIndex
-                ImGui.keepAliveId(columnId)
+                keepAliveId(columnId)
                 val defaultT = columnIndex / dc.columnsCount.f
                 var t = dc.stateStorage.float(columnId, defaultT)
                 if (dc.columnsFlags hasnt ColumnsFlags.NoForceWithinWindow)
@@ -1835,7 +1835,7 @@ interface imgui_internal {
             } else {
                 /*  We treat ImGuiSetCondition_Once and ImGuiSetCondition_FirstUseEver the same because tree node state
                     are not saved persistently.                 */
-                val storedValue = storage.intaaaaa(id, -1)
+                val storedValue = storage.intaaaaaaaaa(id, -1)
                 if (storedValue == -1) {
                     isOpen = g.setNextTreeNodeOpenVal
                     storage[id] = isOpen
@@ -1844,7 +1844,7 @@ interface imgui_internal {
             }
             g.setNextTreeNodeOpenCond = 0
         } else
-            isOpen = storage.intaaaaa(id, if (flags has TreeNodeFlags.DefaultOpen) 1 else 0) != 0 // TODO rename back
+            isOpen = storage.intaaaaaaaaa(id, if (flags has TreeNodeFlags.DefaultOpen) 1 else 0) != 0 // TODO rename back
 
         /*  When logging is enabled, we automatically expand tree nodes (but *NOT* collapsing headers.. seems like
             sensible behavior).

src/main/kotlin/imgui/imgui/widgets.kt

@@ -90,15 +90,15 @@ interface imgui_widgets {
         if (window.skipItems) return
 
         val fmt =
-                try{
+//                try{
                     if (args.isEmpty())
                         fmt
                     else
                         fmt.format(style.locale, *args)
-                }catch (err: Exception) {
-                    println("fmt $fmt, args: ${args}")
-                    TODO()
-                }
+//                }catch (err: Exception) {
+//                    println("fmt $fmt, args: ${args}")
+//                    TODO()
+//                }
 
         val textEnd = fmt.length
         textUnformatted(fmt, textEnd)

src/main/kotlin/imgui/imgui/window.kt

@@ -711,8 +711,7 @@ interface imgui_window {
     val contentRegionMax: Vec2
         get() = with(currentWindowRead!!) {
             val mx = Vec2(contentsRegionRect.max)
-            if (dc.columnsCount != 1)
-                mx.x = getColumnOffset(dc.columnsCurrent + 1) - windowPadding.x
+            if (dc.columnsCount != 1) mx.x = getColumnOffset(dc.columnsCurrent + 1) - windowPadding.x
             return mx
         }