fixed #47

kotlin-graphics · Jul 27, 2018 · 0b12a2e · 0b12a2e
1 parent 02f50b8
commit 0b12a2e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/imgui/imgui/demo/showExampleApp/StyleEditor.kt b/src/main/kotlin/imgui/imgui/demo/showExampleApp/StyleEditor.kt
@@ -124,7 +124,7 @@ object StyleEditor {
             if (style.curveTessellationTol < 0f) style.curveTessellationTol = 0.1f
             /*  Not exposing zero here so user doesn't "lose" the UI (zero alpha clips all widgets).
                 But application code could have a toggle to switch between zero and non-zero.             */
-            dragFloat("Global Alpha", style::alpha, 0.005f, 0.2f, 1f, "%.2f") // TODO fix me dragging
+            dragFloat("Global Alpha", style::alpha, 0.005f, 0.2f, 1f, "%.2f")
             popItemWidth()
         }
 

diff --git a/src/main/kotlin/imgui/imgui/internal.kt b/src/main/kotlin/imgui/imgui/internal.kt
@@ -3512,7 +3512,7 @@ interface imgui_internal {
             if (format[fmtStart] != '%' || format[fmtStart + 1] == '%') // Don't apply if the value is not visible in the format string
                 return value
             val vStr = format.substring(parseFormatFindStart(format)).format(style.locale, value)
-            return vStr.trimStart().f
+            return vStr.trimStart().split(Regex("\\s+"))[0].f
         }
 
         fun roundScalarWithFormat(format: String, value: Double): Double {

diff --git a/src/main/kotlin/imgui/imgui/main.kt b/src/main/kotlin/imgui/imgui/main.kt
@@ -740,7 +740,7 @@ interface imgui_main {
                 val vNewNormCurved = vOldNormCurved + g.dragCurrentAccum / (vMax - vMin)
                 vCur = vMin + glm.pow(saturate(vNewNormCurved.f), power).L * (vMax - vMin)
                 vOldRefForAccumRemainder = vOldNormCurved
-            } else vCur += g.dragCurrentAccum.i
+            } else vCur += g.dragCurrentAccum.L
 
             // Round to user desired precision based on format string
             vCur = roundScalarWithFormat(format, vCur)
@@ -829,7 +829,7 @@ interface imgui_main {
                 val vNewNormCurved = vOldNormCurved + g.dragCurrentAccum / (vMax - vMin)
                 vCur = vMin + glm.pow(saturate(vNewNormCurved.f), power) * (vMax - vMin)
                 vOldRefForAccumRemainder = vOldNormCurved
-            } else vCur += g.dragCurrentAccum.i
+            } else vCur += g.dragCurrentAccum
             // Round to user desired precision based on format string
             vCur = roundScalarWithFormat(format, vCur)
 
@@ -916,7 +916,7 @@ interface imgui_main {
                 val vNewNormCurved = vOldNormCurved + g.dragCurrentAccum / (vMax - vMin)
                 vCur = vMin + glm.pow(saturate(vNewNormCurved.f), power).d * (vMax - vMin)
                 vOldRefForAccumRemainder = vOldNormCurved
-            } else vCur += g.dragCurrentAccum.i
+            } else vCur += g.dragCurrentAccum.d
 
             // Round to user desired precision based on format string
             vCur = roundScalarWithFormat(format, vCur)