Add WindowInfo.containerSize
#785
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
m-sasha
reviewed
Sep 1, 2023
compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/WindowInfo.skiko.kt
Show resolved
Hide resolved
compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/WindowInfo.skiko.kt
Outdated
Show resolved
Hide resolved
m-sasha
reviewed
Sep 1, 2023
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
|
Consider adding a (skiko) unit test. |
|
Maybe also add |
igordmn
reviewed
Sep 1, 2023
compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/WindowInfo.skiko.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
MatkovIvan
force-pushed
the
ivan.matkov/windowinfo-size
branch
from
38000c9
to
6dda784
Compare
MatkovIvan
force-pushed
the
ivan.matkov/windowinfo-size
branch
from
b2bffb2
to
f2b7055
Compare
igordmn
approved these changes
Sep 4, 2023
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
m-sasha
reviewed
Sep 5, 2023
Comment on lines
+155
to
+160
|
|
||
| assertThat(window.scene.platform.windowInfo.containerSize) | ||
| .isEqualTo(IntSize( | ||
| width = (234 * window.density.density).toInt(), | ||
| height = (345 * window.density.density).toInt(), | ||
| )) |
There was a problem hiding this comment.
I think it's better to test WindowInfo separately from other things. A good test should validate one thing.
Also, don't you want to test it inside the composition (i.e. with LocalWindow.current.containerSize?
m-sasha
approved these changes
Sep 5, 2023
igordmn
added a commit
that referenced
this pull request
Sep 14, 2023
Fixes a CI fail: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4313900?buildTab=dependencies&mode=list&state=failed&type=snapshot&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildProblemsSection=true&showLog=4313895_245_235.297&logFilter=debug&logView=flowAware#4313895 As it was before #785 Also: - add default getters for source compatibility - add JvmDefaultWithCompatibility to keep binary compatibility on JVM ## Test ``` import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.window.singleWindowApplication fun main() = singleWindowApplication { val modifiers = LocalWindowInfo.current.keyboardModifiers } ``` This shouldn't require OptIn
igordmn
added a commit
that referenced
this pull request
Sep 14, 2023
Fixes a CI fail: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4313900?buildTab=dependencies&mode=list&state=failed&type=snapshot&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildProblemsSection=true&showLog=4313895_245_235.297&logFilter=debug&logView=flowAware#4313895 As it was before #785 Also: - add default getters for source compatibility - add JvmDefaultWithCompatibility to keep binary compatibility on JVM ## Testing ``` import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.window.singleWindowApplication fun main() = singleWindowApplication { val modifiers = LocalWindowInfo.current.keyboardModifiers } ``` This shouldn't require OptIn
igordmn
added a commit
that referenced
this pull request
Sep 14, 2023
Fixes a CI fail: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4313900?buildTab=dependencies&mode=list&state=failed&type=snapshot&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildProblemsSection=true&showLog=4313895_245_235.297&logFilter=debug&logView=flowAware#4313895 As it was before #785 Also: - add default getters for source compatibility - add JvmDefaultWithCompatibility to keep binary compatibility on JVM ## Testing ``` import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.window.singleWindowApplication fun main() = singleWindowApplication { val modifiers = LocalWindowInfo.current.keyboardModifiers } ``` This shouldn't require OptIn
igordmn
pushed a commit
that referenced
this pull request
Nov 15, 2023
* Add WindowInfo.size * Address feedback * Use delegated property in WindowInfoImpl * Revert size rounding * Rename to containerSize * Add windowInfo.containerSize checks * Address feedback * Provide LocalWindowInfo in tests
igordmn
added a commit
that referenced
this pull request
Nov 15, 2023
#818) Fixes a CI fail: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4313900?buildTab=dependencies&mode=list&state=failed&type=snapshot&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildProblemsSection=true&showLog=4313895_245_235.297&logFilter=debug&logView=flowAware#4313895 As it was before #785 Also: - add default getters for source compatibility - add JvmDefaultWithCompatibility to keep binary compatibility on JVM ## Testing ``` import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.window.singleWindowApplication fun main() = singleWindowApplication { val modifiers = LocalWindowInfo.current.keyboardModifiers } ``` This shouldn't require OptIn
igordmn
pushed a commit
that referenced
this pull request
Nov 16, 2023
…rdModifiers (#818) Fixes a CI fail: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4313900?buildTab=dependencies&mode=list&state=failed&type=snapshot&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildProblemsSection=true&showLog=4313895_245_235.297&logFilter=debug&logView=flowAware#4313895 As it was before #785 Also: - add default getters for source compatibility - add JvmDefaultWithCompatibility to keep binary compatibility on JVM ## Testing ``` import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.window.singleWindowApplication fun main() = singleWindowApplication { val modifiers = LocalWindowInfo.current.keyboardModifiers } ``` This shouldn't require OptIn
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
WindowInfo.containerSizepublic APIIt requires for max available space calculation in some material components.
Testing
Test: Try to get window size via
LocalWindowInfo.current