Fix InputMethodSession.getTextLocation (#2118)

Author: m-sasha

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/Utils.desktop.kt

@@ -16,6 +16,7 @@
 
 package androidx.compose.ui.awt
 
+import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntRect
@@ -45,18 +46,38 @@ internal fun Component.isParentOf(component: Component?): Boolean {
     return false
 }
 
-internal fun IntRect.toAwtRectangle(density: Density): Rectangle {
-    val left = floor(left / density.density).toInt()
-    val top = floor(top / density.density).toInt()
-    val right = ceil(right / density.density).toInt()
-    val bottom = ceil(bottom / density.density).toInt()
-    val width = right - left
-    val height = bottom - top
-    return Rectangle(
-        left, top, width, height
-    )
+internal fun toAwtRectangle(
+    left: Float,
+    top: Float,
+    right: Float,
+    bottom: Float,
+    density: Float
+): Rectangle {
+    val rleft = floor(left / density).toInt()
+    val rtop = floor(top / density).toInt()
+    val rright = ceil(right / density).toInt()
+    val rbottom = ceil(bottom / density).toInt()
+    val rwidth = rright - rleft
+    val rheight = rbottom - rtop
+    return Rectangle(rleft, rtop, rwidth, rheight)
 }
 
+internal fun IntRect.toAwtRectangle(density: Density = Density(1f)) = toAwtRectangle(
+    left = left.toFloat(),
+    top = top.toFloat(),
+    right = right.toFloat(),
+    bottom = bottom.toFloat(),
+    density = density.density
+)
+
+internal fun Rect.toAwtRectangle(density: Density) = toAwtRectangle(
+    left = left,
+    top = top,
+    right = right,
+    bottom = bottom,
+    density = density.density
+)
+
 internal fun Color.toAwtColor() = java.awt.Color(red, green, blue, alpha)
 
 internal fun getTransparentWindowBackground(

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/DesktopTextInputService2.kt

@@ -16,6 +16,7 @@
 
 package androidx.compose.ui.platform
 
+import androidx.compose.ui.awt.toAwtRectangle
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.scene.ComposeSceneMediator
 import androidx.compose.ui.text.TextRange
@@ -178,13 +179,13 @@ private class InputMethodSession(
     }
 
     override fun getTextLocation(offset: TextHitInfo?): Rectangle? {
-        return focusedRect?.let {
-            val x = (it.right / component.density.density).toInt() +
-                component.locationOnScreen.x
-            val y = (it.top / component.density.density).toInt() +
-                component.locationOnScreen.y
-            Rectangle(x, y, it.width.toInt(), it.height.toInt())
-        }
+        val awtRect = focusedRect?.let {
+            it.copy(left = it.right).toAwtRectangle(component.density)
+        } ?: return null
+
+        val locationOnScreen = component.locationOnScreen
+        awtRect.translate(locationOnScreen.x, locationOnScreen.y)
+        return awtRect
     }
 
     override fun getCommittedText(

compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/window/window/BaseWindowTextFieldTest.kt

@@ -171,7 +171,7 @@ open class BaseWindowTextFieldTest {
                     BasicTextField(
                         value = textFieldValue,
                         onValueChange = {
-                            textFieldValue = it.also { println(it) }
+                            textFieldValue = it
                         },
                         modifier = Modifier.focusRequester(focusRequester)
                     )