New Window and DialogWindow APIs (#2938)

Author: m-sasha

compose/ui/ui-unit/api/ui-unit.klib.api

@@ -392,6 +392,7 @@ final const val androidx.compose.ui.unit/MaxDimensionsAndFocusMask // androidx.c
     final fun <get-MaxDimensionsAndFocusMask>(): kotlin/Long // androidx.compose.ui.unit/MaxDimensionsAndFocusMask.<get-MaxDimensionsAndFocusMask>|<get-MaxDimensionsAndFocusMask>(){}[0]
 
 final val androidx.compose.ui.unit/androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop // androidx.compose.ui.unit/androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop|#static{}androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop[0]
+final val androidx.compose.ui.unit/androidx_compose_ui_unit_DpInsets$stableprop // androidx.compose.ui.unit/androidx_compose_ui_unit_DpInsets$stableprop|#static{}androidx_compose_ui_unit_DpInsets$stableprop[0]
 final val androidx.compose.ui.unit/androidx_compose_ui_unit_DpRect$stableprop // androidx.compose.ui.unit/androidx_compose_ui_unit_DpRect$stableprop|#static{}androidx_compose_ui_unit_DpRect$stableprop[0]
 final val androidx.compose.ui.unit/androidx_compose_ui_unit_IntRect$stableprop // androidx.compose.ui.unit/androidx_compose_ui_unit_IntRect$stableprop|#static{}androidx_compose_ui_unit_IntRect$stableprop[0]
 final val androidx.compose.ui.unit/center // androidx.compose.ui.unit/center|@androidx.compose.ui.unit.DpSize{}center[0]
@@ -467,6 +468,7 @@ final fun androidx.compose.ui.unit/IntRect(androidx.compose.ui.unit/IntOffset, k
 final fun androidx.compose.ui.unit/TextUnit(kotlin/Float, androidx.compose.ui.unit/TextUnitType): androidx.compose.ui.unit/TextUnit // androidx.compose.ui.unit/TextUnit|TextUnit(kotlin.Float;androidx.compose.ui.unit.TextUnitType){}[0]
 final fun androidx.compose.ui.unit/Velocity(kotlin/Float, kotlin/Float): androidx.compose.ui.unit/Velocity // androidx.compose.ui.unit/Velocity|Velocity(kotlin.Float;kotlin.Float){}[0]
 final fun androidx.compose.ui.unit/androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop_getter(): kotlin/Int // androidx.compose.ui.unit/androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop_getter|androidx_compose_ui_unit_ComposeUiUnitFlags$stableprop_getter(){}[0]
+final fun androidx.compose.ui.unit/androidx_compose_ui_unit_DpInsets$stableprop_getter(): kotlin/Int // androidx.compose.ui.unit/androidx_compose_ui_unit_DpInsets$stableprop_getter|androidx_compose_ui_unit_DpInsets$stableprop_getter(){}[0]
 final fun androidx.compose.ui.unit/androidx_compose_ui_unit_DpRect$stableprop_getter(): kotlin/Int // androidx.compose.ui.unit/androidx_compose_ui_unit_DpRect$stableprop_getter|androidx_compose_ui_unit_DpRect$stableprop_getter(){}[0]
 final fun androidx.compose.ui.unit/androidx_compose_ui_unit_IntRect$stableprop_getter(): kotlin/Int // androidx.compose.ui.unit/androidx_compose_ui_unit_IntRect$stableprop_getter|androidx_compose_ui_unit_IntRect$stableprop_getter(){}[0]
 final fun androidx.compose.ui.unit/checkArithmetic(androidx.compose.ui.unit/TextUnit) // androidx.compose.ui.unit/checkArithmetic|checkArithmetic(androidx.compose.ui.unit.TextUnit){}[0]

compose/ui/ui-unit/src/nonAndroidMain/kotlin/androidx/compose/ui/unit/DpInsets.nonAndroid.kt

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2026 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.unit
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.ExperimentalComposeUiApi
+
+
+/**
+ * Represents a set of insets in [Dp] units.
+ */
+@ExperimentalComposeUiApi
+@Immutable
+class DpInsets(
+    val top: Dp,
+    val left: Dp,
+    val bottom: Dp,
+    val right: Dp
+) {
+
+    /**
+     * Returns the sum of the insets.
+     */
+    operator fun plus(other: DpInsets) = DpInsets(
+        top = top + other.top,
+        left = left + other.left,
+        bottom = bottom + other.bottom,
+        right = right + other.right
+    )
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is DpInsets) return false
+
+        if (top != other.top) return false
+        if (left != other.left) return false
+        if (bottom != other.bottom) return false
+        if (right != other.right) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = top.hashCode()
+        result = 31 * result + left.hashCode()
+        result = 31 * result + bottom.hashCode()
+        result = 31 * result + right.hashCode()
+        return result
+    }
+}
+
+/**
+ * Returns the rectangle remaining after applying the given insets.
+ */
+@ExperimentalComposeUiApi
+operator fun DpRect.minus(insets: DpInsets): DpRect =
+    DpRect(
+        top = top + insets.top,
+        left = left + insets.left,
+        bottom = bottom - insets.bottom,
+        right = right - insets.right
+    )
+
+/**
+ * Returns the size after adding the given insets.
+ */
+@ExperimentalComposeUiApi
+operator fun DpSize.plus(insets: DpInsets): DpSize =
+    DpSize(
+        width = width + insets.left + insets.right,
+        height = height + insets.top + insets.bottom
+    )

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.KeyEvent
+import androidx.compose.ui.layout.MeasurableRootContent
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.semantics.dialog
 import androidx.compose.ui.semantics.semantics
@@ -313,6 +314,14 @@ class ComposeDialog : JDialog {
         return composePanel.saveState()
     }
 
+    /**
+     * Returns an object through which the composable content of the window can be queried for its
+     * size preferences, such as its intrinsic size.
+     */
+    @ExperimentalComposeUiApi
+    val measurableContent: MeasurableRootContent
+        get() = composePanel.measurableContent
+
     override fun dispose() {
         super.dispose()
         composePanel.dispose()

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.KeyEvent
+import androidx.compose.ui.layout.MeasurableRootContent
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.unit.Dp
@@ -35,7 +36,7 @@ import java.awt.GraphicsConfiguration
 import java.awt.event.MouseListener
 import java.awt.event.MouseMotionListener
 import java.awt.event.MouseWheelListener
-import java.util.Locale
+import java.util.*
 import javax.swing.JFrame
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
@@ -196,6 +197,13 @@ class ComposeWindow @ExperimentalComposeUiApi constructor(
         return composePanel.saveState()
     }
 
+    /**
+     * Returns an object through which the composable content of the window can be queried for its
+     * size preferences, such as its intrinsic size.
+     */
+    @ExperimentalComposeUiApi
+    val measurableContent: MeasurableRootContent by composePanel::measurableContent
+
     override fun dispose() {
         super.dispose()
         composePanel.dispose()

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.ComposeFeatureFlags
 import androidx.compose.ui.LayerType
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.KeyEvent
+import androidx.compose.ui.layout.MeasurableRootContent
 import androidx.compose.ui.scene.ComposeContainer
 import androidx.savedstate.SavedState
 import java.awt.Component
@@ -116,6 +117,9 @@ internal class ComposeWindowPanel(
         isFocusCycleRoot = true
     }
 
+    val measurableContent: MeasurableRootContent
+        get() = composeContainer.measurableContent
+
     override fun setBounds(x: Int, y: Int, width: Int, height: Int) {
         super.setBounds(x, y, width, height)
         composeContainer.setBounds(0, 0, width, height)

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

@@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.input.key.KeyEvent
@@ -146,7 +147,12 @@ fun SwingDialog(
             // - Make the dialog displayable
             // - Size the dialog and the ComposeLayer correctly, so that we can draw it here
             if (!wasDisplayable && it.isDisplayable) {
-                it.renderImmediately()
+                Snapshot.withoutReadObservation {
+                    if (!it.isValid) {
+                        it.validate()
+                    }
+                    it.renderImmediately()
+                }
             }
         },
     )

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

@@ -135,11 +135,14 @@ fun SwingWindow(
 
             // If displaying for the first time, make sure we draw the first frame before making
             // the window visible to avoid showing the window background
-            // It's the responsibility of setSizeSafely to
+            // It's the responsibility of update(it) to:
             // - Make the window displayable
             // - Size the window and the ComposeLayer correctly, so that we can draw it here
             if (!wasDisplayable && it.isDisplayable) {
                 Snapshot.withoutReadObservation {
+                    if (!it.isValid) {
+                        it.validate()
+                    }
                     it.renderImmediately()
                 }
             }

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

@@ -18,7 +18,9 @@ package androidx.compose.ui.awt
 
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.DpRect
 import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.size
 import androidx.compose.ui.util.fastRoundToInt
 import java.awt.Component
 import java.awt.EventQueue
@@ -59,14 +61,36 @@ internal fun toAwtRectangle(
     return Rectangle(rleft, rtop, rwidth, rheight)
 }
 
-internal fun IntRect.toAwtRectangle(density: Density = Density(1f)) = toAwtRectangle(
+internal fun IntRect.toAwtRectangle(density: Density) = toAwtRectangle(
     left = left.toFloat(),
     top = top.toFloat(),
     right = right.toFloat(),
     bottom = bottom.toFloat(),
     density = density.density
 )
 
+internal fun DpRect.toAwtRectangleRounded(): Rectangle {
+    val left = this.left.value.fastRoundToInt()
+    val top = this.top.value.fastRoundToInt()
+    val right = this.right.value.fastRoundToInt()
+    val bottom = this.bottom.value.fastRoundToInt()
+    return Rectangle(left, top, right - left, bottom - top)
+}
+
+/**
+ * Returns a [java.awt.Rectangle] corresponding to this [DpRect], in the given density.
+ *
+ * The size of the rectangle is rounded up to the nearest integer.
+ */
+internal fun DpRect.toAwtRectangleSizeRoundedUp(): Rectangle {
+    val left = this.left.value.fastRoundToInt()
+    val top = this.top.value.fastRoundToInt()
+    val size = this.size
+    val width = ceil(size.width.value).toInt()
+    val height = ceil(size.height.value).toInt()
+    return Rectangle(left, top, width, height)
+}
+
 /**
  * Returns a [java.awt.Rectangle] corresponding to this [Rect], in the given density.
  *
@@ -159,4 +183,4 @@ internal class DebouncingEdtExecutor {
             }
         }
     }
-}
+}