🚧 (broken) Internals: made ScrollbarEx() use ImS64 to facilitate use …

…with larger ranges (not fully tested) + clipper tweaks (#3609, #3962 + ocornut/imgui_club#20) This does NOT fix all problems with large ranges and floating point precision, it merely attenuate them.
kotlin-graphics · Jan 28, 2023 · 9ddd0a2 · 9ddd0a2
1 parent f04f754
commit 9ddd0a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/core/src/main/kotlin/imgui/classes/ListClipper.kt b/core/src/main/kotlin/imgui/classes/ListClipper.kt
@@ -1,8 +1,6 @@
 package imgui.classes
 
-import glm_.i
-import glm_.max
-import glm_.min
+import glm_.*
 import imgui.Dir
 import imgui.api.g
 import imgui.clamp
@@ -190,8 +188,10 @@ class ListClipper {
             //   which with the flooring/ceiling tend to lead to 2 items instead of one being submitted.
             for (i in data.ranges.indices)
                 if (data.ranges[i].posToIndexConvert) {
-                    data.ranges[i].min = clamp(alreadySubmitted + floor((data.ranges[i].min - window.dc.cursorPos.y) / itemsHeight).i + data.ranges[i].posToIndexOffsetMin, alreadySubmitted, itemsCount - 1)
-                    data.ranges[i].max = clamp(alreadySubmitted + ceil((data.ranges[i].max - window.dc.cursorPos.y) / itemsHeight).i + 0 + data.ranges[i].posToIndexOffsetMax, data.ranges[i].min + 1, itemsCount)
+                    val m1 = ((data.ranges[i].min.d - window.dc.cursorPos.y) / itemsHeight).i
+                    val m2 = (((data.ranges[i].max.d - window.dc.cursorPos.y) / itemsHeight) + 0.999999f).i
+                    data.ranges[i].min = clamp(alreadySubmitted + m1 + floor((data.ranges[i].min - window.dc.cursorPos.y) / itemsHeight).i + data.ranges[i].posToIndexOffsetMin, alreadySubmitted, itemsCount - 1)
+                    data.ranges[i].max = clamp(alreadySubmitted + m2 + ceil((data.ranges[i].max - window.dc.cursorPos.y) / itemsHeight).i + 0 + data.ranges[i].posToIndexOffsetMax, data.ranges[i].min + 1, itemsCount)
                     data.ranges[i].posToIndexConvert = false
                 }
             sortAndFuseRanges(data.ranges, data.stepNo)
@@ -243,8 +243,9 @@ class ListClipper {
 
         fun seekCursorForItem(clipper: ListClipper, itemN: Int) {
             // StartPosY starts from ItemsFrozen hence the subtraction
+            // Perform the add and multiply with double to allow seeking through larger ranges
             val data = clipper.tempData as ListClipperData
-            val posY = clipper.startPosY + (itemN - data.itemsFrozen) * clipper.itemsHeight
+            val posY = (clipper.startPosY.d + (itemN - data.itemsFrozen).d * clipper.itemsHeight).f
             seekCursorAndSetupPrevLine(posY, clipper.itemsHeight)
         }
 

diff --git a/core/src/main/kotlin/imgui/internal/api/widgets.kt b/core/src/main/kotlin/imgui/internal/api/widgets.kt
@@ -1,5 +1,7 @@
 package imgui.internal.api
 
+import glm_.L
+import glm_.f
 import glm_.func.common.max
 import glm_.i
 import glm_.vec2.Vec2
@@ -312,7 +314,9 @@ internal interface widgets {
         }
         val sizeAvail = window.innerRect.max[axis] - window.innerRect.min[axis]
         val sizeContents = window.contentSize[axis] + window.windowPadding[axis] * 2f
-        scrollbarEx(bb, id, axis, if (axis == Axis.X) window.scroll::x else window.scroll::y, sizeAvail, sizeContents, roundingCorners)
+        _L = window.scroll[axis].L
+        scrollbarEx(bb, id, axis, ::_L, sizeAvail.L, sizeContents.L, roundingCorners)
+        window.scroll[axis] = _L.f
     }
 
     /** Vertical/Horizontal scrollbar
@@ -321,7 +325,7 @@ internal interface widgets {
      *  - We store values as normalized ratio and in a form that allows the window content to change while we are holding on a scrollbar
      *  - We handle both horizontal and vertical scrollbars, which makes the terminology not ideal.
      *  Still, the code should probably be made simpler..   */
-    fun scrollbarEx(bbFrame: Rect, id: ID, axis: Axis, pScrollV: KMutableProperty0<Float>, sizeAvailV: Float, sizeContentsV: Float, flags: DrawFlags): Boolean {
+    fun scrollbarEx(bbFrame: Rect, id: ID, axis: Axis, pScrollV: KMutableProperty0<Long>, sizeAvailV: Long, sizeContentsV: Long, flags: DrawFlags): Boolean {
 
         var scrollV by pScrollV
 
@@ -352,15 +356,15 @@ internal interface widgets {
         // Calculate the height of our grabbable box. It generally represent the amount visible (vs the total scrollable amount)
         // But we maintain a minimum size in pixel to allow for the user to still aim inside.
         assert(max(sizeContentsV, sizeAvailV) > 0f) { "Adding this assert to check if the ImMax(XXX,1.0f) is still needed. PLEASE CONTACT ME if this triggers." }
-        val winSizeV = max(sizeContentsV max sizeAvailV, 1f)
-        val grabHPixels = clamp(scrollbarSizeV * (sizeAvailV / winSizeV), style.grabMinSize, scrollbarSizeV)
+        val winSizeV = max(sizeContentsV max sizeAvailV, 1L)
+        val grabHPixels = clamp(scrollbarSizeV * (sizeAvailV.f / winSizeV.f), style.grabMinSize, scrollbarSizeV)
         val grabHNorm = grabHPixels / scrollbarSizeV
 
         // Handle input right away. None of the code of Begin() is relying on scrolling position before calling Scrollbar().
         val (_, hovered, held) = buttonBehavior(bb, id, ButtonFlag.NoNavFocus)
 
-        val scrollMax = max(1f, sizeContentsV - sizeAvailV)
-        var scrollRatio = saturate(scrollV / scrollMax)
+        val scrollMax = max(1L, sizeContentsV - sizeAvailV)
+        var scrollRatio = saturate(scrollV.f / scrollMax.f)
         var grabVNorm = scrollRatio * (scrollbarSizeV - grabHPixels) / scrollbarSizeV  // Grab position in normalized space
         if (held && allowInteraction && grabHNorm < 1f) {
             val scrollbarPosV = bb.min[axis]
@@ -383,10 +387,10 @@ internal interface widgets {
             // Apply scroll (p_scroll_v will generally point on one member of window->Scroll)
             // It is ok to modify Scroll here because we are being called in Begin() after the calculation of ContentSize and before setting up our starting position
             val scrollVNorm = saturate((clickedVNorm - g.scrollbarClickDeltaToGrabCenter - grabHNorm * 0.5f) / (1f - grabHNorm))
-            scrollV = round(scrollVNorm * scrollMax) //(win_size_contents_v - win_size_v));
+            scrollV = (scrollVNorm * scrollMax).L
 
             // Update values for rendering
-            scrollRatio = saturate(scrollV / scrollMax)
+            scrollRatio = saturate(scrollV.f / scrollMax.f)
             grabVNorm = scrollRatio * (scrollbarSizeV - grabHPixels) / scrollbarSizeV
 
             // Update distance to grab now that we have seeked and saturated