fixed number conversions

Author: elect86

imgui.ini

@@ -1,10 +1,10 @@
-[Window][Debug##Default]
-Pos=60,60
-Size=400,400
-Collapsed=0
-
 [Window][ImGui Demo]
 Pos=650,20
 Size=550,680
 Collapsed=0
 
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+

src/main/kotlin/imgui/Ref.kt

@@ -51,16 +51,16 @@ object Ref {
 
     var int
         get() = ints[iPtr]
-        set(value) { ints[iPtr] = value }
+        set(value) = ints.set(iPtr, value)
     var float
         get() = floats[fPtr]
-        set(value) { floats[fPtr] = value }
+        set(value) = floats.set(fPtr, value)
     var bool
         get() = bools[bPtr]
-        set(value) { bools[bPtr] = value }
+        set(value) = bools.set(bPtr, value)
     var char
         get() = chars[cPtr]
-        set(value) { chars[cPtr] = value }
+        set(value) = chars.set(cPtr, value)
 }
 
 //inline fun <R>withInt(block: (KMutableProperty0<Int>) -> R): R {

src/main/kotlin/imgui/TextEditState.kt

@@ -76,7 +76,7 @@ class TextEditState {
     fun getChar(idx: Int) = text[idx]
     fun getWidth(lineStartIdx: Int, charIdx: Int): Float {
         val c = text[lineStartIdx + charIdx]
-        return if (c == '\n') -1f else g.font.getCharAdvance_ssaaaaaaa(c) * (g.fontSize / g.font.fontSize)
+        return if (c == '\n') -1f else g.font.getCharAdvance_ssaaaaaaaa(c) * (g.fontSize / g.font.fontSize)
     }
 
     fun keyToText(key: Int) = if (key >= 0x10000) 0 else key

src/main/kotlin/imgui/font.kt

@@ -1055,7 +1055,7 @@ class Font {
     fun findGlyphNoFallback(c: Int) = indexLookup.getOrNull(c)?.let { glyphs[it] }
 
     //    IMGUI_API void              SetFallbackChar(ImWchar c);
-    fun getCharAdvance_ssaaaaaaa(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
+    fun getCharAdvance_ssaaaaaaaa(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
 
     val isLoaded get() = ::containerAtlas.isInitialized
 

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

@@ -335,8 +335,8 @@ interface imgui_internal {
         itemFlags = itemFlagsStack.lastOrNull() ?: If.Default_.i
     }
 
-    fun setCurrentFont(font: Font)    {
-        assert(font.isLoaded){"Font Atlas not created. Did you call io.Fonts->GetTexDataAsRGBA32 / GetTexDataAsAlpha8 ?"}
+    fun setCurrentFont(font: Font) {
+        assert(font.isLoaded) { "Font Atlas not created. Did you call io.Fonts->GetTexDataAsRGBA32 / GetTexDataAsAlpha8 ?" }
         assert(font.scale > 0f)
         g.font = font
         g.fontBaseSize = io.fontGlobalScale * g.font.fontSize * g.font.scale
@@ -2261,7 +2261,7 @@ interface imgui_internal {
                             inputTextCalcTextSizeW(text, p, textSelectedEnd, it, stopOnNewLine = true).also { p = it() }
                         }
                         // So we can see selected empty lines
-                        if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_ssaaaaaaa(' ') * 0.5f).i.f
+                        if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_ssaaaaaaaa(' ') * 0.5f).i.f
                         val rect = Rect(rectPos + Vec2(0f, bgOffYUp - g.fontSize), rectPos + Vec2(rectSize.x, bgOffYDn))
                         val clipRect_ = Rect(clipRect)
                         rect.clipWith(clipRect_)
@@ -2442,9 +2442,10 @@ interface imgui_internal {
             g.scalarAsInputTextId = g.activeId
             setHoveredId(id)
         }
-        return if (textValueChanged)
-            dataTypeApplyOpFromText(buf, g.inputTextState.initialText, dataType, data)
-        else false
+        return when {
+            textValueChanged -> dataTypeApplyOpFromText(buf, g.inputTextState.initialText, dataType, data)
+            else -> false
+        }
     }
 
     /** Note: only access 3 floats if ColorEditFlag.NoAlpha flag is set.   */
@@ -2811,17 +2812,17 @@ interface imgui_internal {
 
         // Modal windows prevents cursor from hovering behind them.
         val modalWindow = frontMostModalRootWindow
-        if(modalWindow != null)
-            if(g.hoveredRootWindow?.isChildOf(modalWindow) == false)
+        if (modalWindow != null)
+            if (g.hoveredRootWindow?.isChildOf(modalWindow) == false)
                 nullate()
         // Disabled mouse?
         if (io.configFlags has ConfigFlag.NoMouse)
             nullate()
 
         // We track click ownership. When clicked outside of a window the click is owned by the application and won't report hovering nor request capture even while dragging over our windows afterward.
-        var mouseEarliestButtonDown = - 1
+        var mouseEarliestButtonDown = -1
         var mouseAnyDown = false
-        for (i in io.mouseDown.indices)        {
+        for (i in io.mouseDown.indices) {
             if (io.mouseClicked[i])
                 io.mouseDownOwned[i] = g.hoveredWindow != null || g.openPopupStack.isNotEmpty()
             mouseAnyDown = mouseAnyDown || io.mouseDown[i]
@@ -2852,7 +2853,7 @@ interface imgui_internal {
             io.wantCaptureKeyboard = true
 
         // Update io.WantTextInput flag, this is to allow systems without a keyboard (e.g. mobile, hand-held) to show a software keyboard if possible
-        io.wantTextInput = if(g.wantTextInputNextFrame != -1) g.wantTextInputNextFrame != 0 else false
+        io.wantTextInput = if (g.wantTextInputNextFrame != -1) g.wantTextInputNextFrame != 0 else false
     }
 
     /** Parse display precision back from the display format string */

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

@@ -104,9 +104,7 @@ interface imgui_widgetsDrag {
             }
         }
         if (startTextInput || (g.activeId == id && g.scalarAsInputTextId == id))
-            return withFloatAsInt(v) {
-                inputScalarAsWidgetReplacement(frameBb, label, DataType.Float, it as KMutableProperty0<Number>, id, decimalPrecision)
-            }
+            return inputScalarAsWidgetReplacement(frameBb, label, DataType.Float, v as KMutableProperty0<Number>, id, decimalPrecision)
 
         // Actual drag behavior
         itemSize(totalBb, style.framePadding.y)

src/main/kotlin/imgui/static funcs.kt

@@ -430,7 +430,7 @@ fun inputTextCalcTextSizeW(text: CharArray, textBegin: Int, textEnd: Int, remain
         }
         if (c == '\r') continue
         // renaming ::getCharAdvance continuously every build because of bug, https://youtrack.jetbrains.com/issue/KT-19612
-        val charWidth: Float = font.getCharAdvance_ssaaaaaaa(c) * scale
+        val charWidth: Float = font.getCharAdvance_ssaaaaaaaa(c) * scale
         lineWidth += charWidth
     }
 
@@ -486,11 +486,11 @@ fun KMutableProperty0<Number>.format(dataType: DataType, decimalPrecision: Int,
     val precision = if (decimalPrecision < 0) "" else ".$decimalPrecision"
     return when (dataType) {
 
-        DataType.Int -> "%${precision}d".format(style.locale, this())
+        DataType.Int -> "%${precision}d".format(style.locale, this() as Int)
 /*  Ideally we'd have a minimum decimal precision of 1 to visually denote that it is a float, while hiding
     non-significant digits?         */
-        DataType.Float -> "%${precision}f".format(style.locale, Float.fromBits(this() as Int))
-        DataType.Double -> "%${precision}f".format(style.locale, Double.fromBits(this() as Long))
+        DataType.Float -> "%${precision}f".format(style.locale, this() as Float)
+        DataType.Double -> "%${precision}f".format(style.locale, this() as Double)
         else -> throw Error("unsupported format data type")
     }.toCharArray(buf)
 }