🔥 fixed last small bastard bug, columns working

back online 🌐

Author: elect86

src/main/kotlin/imgui/helpers.kt

@@ -88,7 +88,7 @@ class Storage {
 
     fun clear() = data.clear()
 
-    fun intaaaaaaaaa(key: Int, defaultVal: Int = 0) = data[key] ?: defaultVal // TODO rename back
+    fun intaaaaaaaaaaa(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/inputs.kt

@@ -81,7 +81,7 @@ interface imgui_inputs {
 
         // Expand for touch input
         val rectForTouch = Rect(rectClipped.min - style.touchExtraPadding, rectClipped.max + style.touchExtraPadding)
-        return rectForTouch.contains(IO.mousePos)
+        return rectForTouch contains IO.mousePos
     }
 
     /** shortcut to IO.mousePos provided by user, to be consistent with other calls */

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

@@ -238,7 +238,7 @@ interface imgui_internal {
     fun isClippedEx(bb: Rect, id: Int?, clipEvenWhenLogged: Boolean): Boolean {
 
         val window = currentWindowRead!!
-        if (!bb.overlaps(window.clipRect))
+        if (!(bb overlaps window.clipRect))
             if (id == null || id != g.activeId)
                 if (clipEvenWhenLogged || !g.logEnabled)
                     return true
@@ -453,7 +453,7 @@ interface imgui_internal {
         dc.cursorPos.x = (pos.x + dc.indentX + dc.columnsOffsetX).i.f
     }
 
-    fun pushColumnClipRect(columnIndex: Int = 1) {
+    fun pushColumnClipRect(columnIndex: Int = -1) {
 
         val window = currentWindowRead!!
         val columnIndex = if (columnIndex < 0) window.dc.columnsCurrent else columnIndex
@@ -1566,7 +1566,7 @@ interface imgui_internal {
                         val rect = Rect(rectPos + Vec2(0f, bgOffYUp - g.fontSize), rectPos + Vec2(rectSize.x, bgOffYDn))
                         val clipRect_ = Rect(clipRect)
                         rect.clipWith(clipRect_)
-                        if (rect.overlaps(clipRect_))
+                        if (rect overlaps clipRect_)
                             drawWindow.drawList.addRectFilled(rect.min, rect.max, bgColor)
                     }
                     rectPos.x = renderPos.x - renderScroll.x
@@ -1581,7 +1581,7 @@ interface imgui_internal {
             val cursorIsVisible = g.inputTextState.cursorAnim <= 0f || glm.mod(g.inputTextState.cursorAnim, 1.2f) <= 0.8f
             val cursorScreenPos = renderPos + cursorOffset - renderScroll
             val cursorScreenRect = Rect(cursorScreenPos.x, cursorScreenPos.y - g.fontSize + 0.5f, cursorScreenPos.x + 1f, cursorScreenPos.y - 1.5f)
-            if (cursorIsVisible && cursorScreenRect.overlaps(Rect(clipRect)))
+            if (cursorIsVisible && cursorScreenRect overlaps Rect(clipRect))
                 drawWindow.drawList.addLine(cursorScreenRect.min, cursorScreenRect.bl, Col.Text.u32)
 
             /*  Notify OS of text input position for advanced IME (-1 x offset so that Windows IME can cover our cursor.
@@ -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.intaaaaaaaaa(id, -1)
+                val storedValue = storage.intaaaaaaaaaaa(id, -1)
                 if (storedValue == -1) {
                     isOpen = g.setNextTreeNodeOpenVal
                     storage[id] = isOpen
@@ -1844,7 +1844,7 @@ interface imgui_internal {
             }
             g.setNextTreeNodeOpenCond = 0
         } else
-            isOpen = storage.intaaaaaaaaa(id, if (flags has TreeNodeFlags.DefaultOpen) 1 else 0) != 0 // TODO rename back
+            isOpen = storage.intaaaaaaaaaaa(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/utilities.kt

@@ -34,7 +34,7 @@ interface imgui_utilities {
     fun isItemClicked(mouseButton: Int = 0) = isMouseClicked(mouseButton) && isItemRectHovered()
 
     /** was the last item visible? (aka not out of sight due to clipping/scrolling.)    */
-    val isItemVisible get() = with(currentWindowRead!!) { clipRect.overlaps(dc.lastItemRect) }
+    val isItemVisible get() = with(currentWindowRead!!) { clipRect overlaps dc.lastItemRect }
 
     val isAnyItemHovered get() = g.hoveredId != 0 || g.hoveredIdPreviousFrame != 0
 
@@ -79,10 +79,10 @@ interface imgui_utilities {
         get() = g.hoveredRootWindow != null && (g.hoveredRootWindow === g.currentWindow!!.rootWindow) && g.hoveredRootWindow!!.isContentHoverable
 
     /** test if rectangle (of given size, starting from cursor position) is visible / not clipped.  */
-    fun isRectVisible(size: Vec2) = with(currentWindowRead!!) { clipRect.overlaps(Rect(dc.cursorPos, dc.cursorPos + size)) }
+    fun isRectVisible(size: Vec2) = with(currentWindowRead!!) { clipRect overlaps Rect(dc.cursorPos, dc.cursorPos + size) }
 
     /** test if rectangle (in screen space) is visible / not clipped. to perform coarse clipping on user's side.    */
-    fun isRectVisible(rectMin: Vec2, rectMax: Vec2) = currentWindowRead!!.clipRect.overlaps(Rect(rectMin, rectMax))
+    fun isRectVisible(rectMin: Vec2, rectMax: Vec2) = currentWindowRead!!.clipRect overlaps Rect(rectMin, rectMax)
 
     val time get() = g.time