New Window and DialogWindow APIs #2938
There are no files selected for viewing
|
There was a problem hiding this comment. If it's just data structure (not window-insets or so), probably it should be part of |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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( | ||
|
There was a problem hiding this comment. We must not introduce such API one more time as desktop only. Please reuse the existing one There was a problem hiding this comment. The one in ios is internal; this one is public (but experimental). We could change ios to use this one, but I wouldn't say it's a "must". There are plenty of places where we have internal copies of code because we don't want to create a dependency. Up to the ios team... There was a problem hiding this comment. It's public and in skikoMain There was a problem hiding this comment.
There was a problem hiding this comment.
There was a problem hiding this comment.
Personally, I’m fine with having If this new API is being used for window/platform insets, then I think we should use the existing If we decide to introduce a public dp-based insets API, then I think it should live in common, at the same level as something like As for There was a problem hiding this comment. I moved There was a problem hiding this comment.
These are types for a concrete purpose, not generic geometry types like, for example, So I see no reason to forcibly use There was a problem hiding this comment. If we have an issue with I am also fine with keeping the current Another option is to rename them to There was a problem hiding this comment. I don't see anything wrong with |
||
| 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 | ||
| ) | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DpInsets.skiko.kt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done