- [Fix] Edge case in ScrollPanel where layout might be skipped

- [Versions] Doodle -> 0.11.4
- [Docs] Update docs site

Author: pusolito

Core/src/commonMain/kotlin/io/nacular/doodle/controls/panels/ScrollPanel.kt

@@ -4,6 +4,7 @@ import io.nacular.doodle.controls.panels.ScrollPanelBehavior.ScrollBarType.Horiz
 import io.nacular.doodle.core.Behavior
 import io.nacular.doodle.core.Internal
 import io.nacular.doodle.core.Layout
+import io.nacular.doodle.core.Positionable
 import io.nacular.doodle.core.View
 import io.nacular.doodle.core.behavior
 import io.nacular.doodle.core.scrollTo
@@ -12,13 +13,14 @@ import io.nacular.doodle.drawing.Canvas
 import io.nacular.doodle.geometry.Point
 import io.nacular.doodle.geometry.Point.Companion.Origin
 import io.nacular.doodle.geometry.Rectangle
+import io.nacular.doodle.geometry.Size
 import io.nacular.doodle.layout.Insets
 import io.nacular.doodle.layout.constraints.Bounds
 import io.nacular.doodle.layout.constraints.Constraint
 import io.nacular.doodle.layout.constraints.ConstraintDslContext
 import io.nacular.doodle.layout.constraints.ConstraintLayout
 import io.nacular.doodle.layout.constraints.IdealSizedProperty
-import io.nacular.doodle.layout.constraints.constrain
+import io.nacular.doodle.layout.constraints.impl.ConstraintLayoutImpl
 import io.nacular.doodle.utils.ChangeObservers
 import io.nacular.doodle.utils.ChangeObserversImpl
 import io.nacular.doodle.utils.ObservableList
@@ -189,37 +191,38 @@ public open class ScrollPanel(content: View? = null): View() {
         it.top  eq -scroll.y
         it.left eq -scroll.x
 
-        if (!ignoreLayout) {
-            contentWidthConstraints?.invoke(this, object : IdealSizedProperty() {
-                override val idealValue get() = it.idealWidth
-                override val readOnly   get() = it.width.readOnly
-                override fun toTerm()         = it.width.toTerm()
-            })
-            contentHeightConstraints?.invoke(this, object : IdealSizedProperty() {
-                override val idealValue get() = it.idealHeight
-                override val readOnly   get() = it.height.readOnly
-                override fun toTerm()         = it.height.toTerm()
-            })
-        }
-
-        ignoreLayout = false
+        contentWidthConstraints?.invoke(this, object : IdealSizedProperty() {
+            override val idealValue get() = it.idealWidth
+            override val readOnly   get() = it.width.readOnly
+            override fun toTerm()         = it.width.toTerm()
+        })
+        contentHeightConstraints?.invoke(this, object : IdealSizedProperty() {
+            override val idealValue get() = it.idealHeight
+            override val readOnly   get() = it.height.readOnly
+            override fun toTerm()         = it.height.toTerm()
+        })
     }
 
-    private var ignoreLayout = false
-
     init {
         mirrorWhenRightLeft = false
 
         this.content = content
 
-        layout = when (content) {
-            null -> constrain(view {}) {}
-            else -> constrain(content, contentConstraints)
-        }
+        layout = CustomLayout()
 
         preferredSize = { min, max -> this@ScrollPanel.content?.preferredSize(min, max) ?: min }
     }
 
+    /**
+     * Used to avoid layouts on scroll
+     */
+    private inner class CustomLayout: ConstraintLayoutImpl(content ?: view {}, originalLambda = contentConstraints, block = { (a) -> contentConstraints(a) }) {
+        override fun requiresLayout(child: Positionable, within: Size, old: Rectangle, new: Rectangle) = when {
+            old.size.fastEquals(new.size) -> false
+            else                          -> super.requiresLayout(child, within, old, new)
+        }
+    }
+
     public override var focusable: Boolean = false
 
     override fun render(canvas: Canvas) {
@@ -317,7 +320,7 @@ public open class ScrollPanel(content: View? = null): View() {
                     false -> Point(max(0.0, min(point.x, it.width - width)), max(0.0, min(point.y, it.height - height)))
                 }
 
-                ignoreLayout = true
+//                ignoreLayout = true
                 scroll       =  newScroll
 
                 it.suggestPosition(-newScroll)

Core/src/commonMain/kotlin/io/nacular/doodle/drawing/impl/RenderManagerImpl.kt

@@ -700,7 +700,7 @@ public open class RenderManagerImpl(
 
         when (parent) {
             null -> if (display.layout?.requiresLayout(view.positionable, display.size, old, new) == true) displayPendingLayout = true
-            else -> if (parent != layingOut && parent.layout_?.requiresLayout(view.positionable, parent.size,  old, new) == true) {
+            else -> if (parent != layingOut && parent.layout_?.requiresLayout(view.positionable, parent.size, old, new) == true) {
                 pendingLayout += parent
             }
         }

Core/src/commonMain/kotlin/io/nacular/doodle/layout/constraints/impl/ConstraintLayoutImpl.kt

@@ -194,11 +194,11 @@ internal open class ParentBoundsImpl(private val context: ConstraintDslContext):
     override var insets: Insets = Insets.None
 }
 
-internal class ConstraintLayoutImpl(
-    view: View,
-    vararg others: View,
-    originalLambda: Any,
-    block: ConstraintDslContext.(List<Bounds>) -> Unit
+internal open class ConstraintLayoutImpl(
+           view          : View,
+    vararg others        : View,
+           originalLambda: Any,
+           block         : ConstraintDslContext.(List<Bounds>) -> Unit
 ): ConstraintLayout(), BoundsAttemptObserver {
     private var layingOut     = false
     private val activeBounds  = mutableMapOf<ReflectionVariable, Double>()
@@ -217,7 +217,7 @@ internal class ConstraintLayoutImpl(
 
     override fun boundsChangeAttempted(view: View, old: Rectangle, new: Rectangle, relayout: Boolean) {
         updateBounds(view, new)?.let {
-            if (!layingOut && relayout && view.displayed) {
+            if (!layingOut && relayout && view.displayed && requiresLayout(view.positionable, withinSize(view), old, new)) {
                 when (val p = view.parent) {
                     null -> view.display?.relayout()
                     else -> p.relayout_()
@@ -320,6 +320,11 @@ internal class ConstraintLayoutImpl(
         (exceptionThrown as SetPool).forEach { it(this, exception) }
     }
 
+    private fun withinSize(view: View) = when (val p = view.parent) {
+        null -> view.display?.size ?: Size.Empty
+        else -> p.size
+    }
+
     internal companion object {
         fun setupSolver(
             solver       : Solver,

docs/404.html

@@ -12,7 +12,7 @@
 
 
 <script src="https://unpkg.com/kotlin-playground@1"></script><link rel="stylesheet" href="/doodle/assets/css/styles.ae3d4d5a.css">
-<script src="/doodle/assets/js/runtime~main.b445f854.js" defer="defer"></script>
+<script src="/doodle/assets/js/runtime~main.72adf7e7.js" defer="defer"></script>
 <script src="/doodle/assets/js/main.b2c734db.js" defer="defer"></script>
 </head>
 <body class="navigation-with-keyboard">

docs/assets/js/83baf2f6.b8bb2d85.js docs/assets/js/83baf2f6.e0cc9f12.jsdocs/assets/js/83baf2f6.b8bb2d85.js renamed to docs/assets/js/83baf2f6.e0cc9f12.js

@@ -0,0 +1,59 @@
+/*!****************************!*\
+  !*** ./kotlin/measured.js ***!
+  \****************************/
+
+/*!*******************************!*\
+  !*** ./kotlin/doodle-core.js ***!
+  \*******************************/
+
+/*!********************************!*\
+  !*** ./kotlin/DocApps-Main.js ***!
+  \********************************/
+
+/*!*********************************!*\
+  !*** ./kotlin/doodle-themes.js ***!
+  \*********************************/
+
+/*!**********************************!*\
+  !*** ./kotlin/doodle-browser.js ***!
+  \**********************************/
+
+/*!***********************************!*\
+  !*** ./kotlin/doodle-controls.js ***!
+  \***********************************/
+
+/*!************************************!*\
+  !*** ./kotlin/doodle-animation.js ***!
+  \************************************/
+
+/*!************************************!*\
+  !*** ./kotlin/kotlinx-atomicfu.js ***!
+  \************************************/
+
+/*!****************************************!*\
+  !*** ./kotlin/Kosi-Kaverit-kaverit.js ***!
+  \****************************************/
+
+/*!****************************************!*\
+  !*** ./kotlin/kotlin-kotlin-stdlib.js ***!
+  \****************************************/
+
+/*!*****************************************!*\
+  !*** ./kotlin/Kosi-Kodein-kodein-di.js ***!
+  \*****************************************/
+
+/*!*******************************************!*\
+  !*** ./kotlin/kotlinx-coroutines-core.js ***!
+  \*******************************************/
+
+/*!************************************************************!*\
+  !*** ../../node_modules/@js-joda/core/dist/js-joda.esm.js ***!
+  \************************************************************/
+
+/*!************************************************************!*\
+  !*** ./kotlin/Kotlin-DateTime-library-kotlinx-datetime.js ***!
+  \************************************************************/
+
+/*!********************************************************************!*\
+  !*** ./kotlin/kotlinx-serialization-kotlinx-serialization-core.js ***!
+  \********************************************************************/