Only use positionOnScreen on Android (#503)

This is a speculative fix for #502
chrisbanes · Feb 9, 2025 · 9831637 · 9831637
1 parent 46f74ca
commit 9831637
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/haze/src/androidMain/kotlin/dev/chrisbanes/haze/Utils.android.kt b/haze/src/androidMain/kotlin/dev/chrisbanes/haze/Utils.android.kt
@@ -0,0 +1,13 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.positionOnScreen
+
+/**
+ * We use positionOnScreen on Android, to support dialogs, popup windows, etc.
+ */
+internal actual fun LayoutCoordinates.positionForHaze(): Offset = positionOnScreen()
diff --git a/haze/src/commonMain/kotlin/dev/chrisbanes/haze/HazeEffectNode.kt b/haze/src/commonMain/kotlin/dev/chrisbanes/haze/HazeEffectNode.kt
@@ -264,7 +264,7 @@ class HazeEffectNode(
   }
 
   private fun onPositioned(coordinates: LayoutCoordinates, source: String) {
-    positionOnScreen = coordinates.positionOnScreenCatching()
+    positionOnScreen = coordinates.positionForHaze()
     size = coordinates.size.toSize()
     log(TAG) { "$source: positionOnScreen=$positionOnScreen, size=$size" }
     updateEffect()

diff --git a/haze/src/commonMain/kotlin/dev/chrisbanes/haze/HazeSourceNode.kt b/haze/src/commonMain/kotlin/dev/chrisbanes/haze/HazeSourceNode.kt
@@ -130,7 +130,7 @@ class HazeSourceNode(
   }
 
   private fun onPositioned(coordinates: LayoutCoordinates, source: String) {
-    area.positionOnScreen = coordinates.positionOnScreenCatching()
+    area.positionOnScreen = coordinates.positionForHaze()
     area.size = coordinates.size.toSize()
 
     log(TAG) {

diff --git a/haze/src/commonMain/kotlin/dev/chrisbanes/haze/Utils.kt b/haze/src/commonMain/kotlin/dev/chrisbanes/haze/Utils.kt
@@ -9,7 +9,6 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.geometry.takeOrElse
 import androidx.compose.ui.layout.LayoutCoordinates
-import androidx.compose.ui.layout.positionOnScreen
 import kotlin.math.hypot
 
 internal fun calculateLength(
@@ -37,13 +36,4 @@ internal inline fun <T> unsynchronizedLazy(noinline initializer: () -> T): Lazy<
   return lazy(mode = LazyThreadSafetyMode.NONE, initializer)
 }
 
-/**
- * Workaround for https://youtrack.jetbrains.com/issue/CMP-7380
- */
-internal fun LayoutCoordinates.positionOnScreenCatching(): Offset {
-  return try {
-    positionOnScreen()
-  } catch (t: Throwable) {
-    Offset.Unspecified
-  }
-}
+internal expect fun LayoutCoordinates.positionForHaze(): Offset
diff --git a/haze/src/skikoMain/kotlin/dev/chrisbanes/haze/Utils.skiko.kt b/haze/src/skikoMain/kotlin/dev/chrisbanes/haze/Utils.skiko.kt
@@ -0,0 +1,18 @@
+// Copyright 2025, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.positionInWindow
+
+/**
+ * We only look at window coordinates on Desktop. There's currently no external windows used
+ * on Skiko platforms (AFAIK), so there's no need to look at screen coordinates.
+ */
+internal actual fun LayoutCoordinates.positionForHaze(): Offset = try {
+  positionInWindow()
+} catch (t: Throwable) {
+  Offset.Unspecified
+}