Don't explicitly invalidate the scene when the input handler needs to…

… send synthetic events, as that now happens automatically via recomposer.hasPendingWork
JetBrains · Apr 10, 2024 · c653da1 · c653da1
1 parent 6e996ee
commit c653da1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/BaseComposeScene.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/BaseComposeScene.skiko.kt
@@ -98,8 +98,7 @@ internal abstract class BaseComposeScene(
     private var hasPendingDraws = true
     protected fun invalidateIfNeeded() {
         hasPendingDraws = frameClock.hasAwaiters ||
-            snapshotInvalidationTracker.hasInvalidations ||
-            inputHandler.hasInvalidations
+            snapshotInvalidationTracker.hasInvalidations
         if (hasPendingDraws && !isInvalidationDisabled && !isClosed && composition != null) {
             invalidate()
         }
@@ -163,7 +162,7 @@ internal abstract class BaseComposeScene(
             doLayout()  // Layout
 
             // Schedule synthetic events to be sent after `render` completes
-            if (inputHandler.hasInvalidations) {
+            if (inputHandler.needUpdatePointerPosition) {
                 recomposer.scheduleAsEffect(updatePointerPosition)
             }
 

diff --git a/...se/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/ComposeSceneInputHandler.skiko.kt b/...se/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/ComposeSceneInputHandler.skiko.kt
@@ -64,10 +64,9 @@ internal class ComposeSceneInputHandler(
         get() = pointerPositions.values.firstOrNull()
 
     /**
-     * Indicates if there were invalidations and triggering [BaseComposeScene.measureAndLayout]
-     * is now required.
+     * Indicates whether [updatePointerPosition] needs to be called.
      */
-    val hasInvalidations: Boolean
+    val needUpdatePointerPosition: Boolean
         get() = syntheticEventSender.needUpdatePointerPosition
 
     fun onPointerEvent(