From 90474afef18206e7ea7dacacd22a072cb950be3f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 28 Jun 2023 18:58:59 +0200 Subject: [PATCH] Ensure dropdown menu is 200.dp width. --- .../android/features/roomdetails/impl/RoomDetailsView.kt | 1 - .../libraries/designsystem/theme/components/DropdownMenu.kt | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt index c4c4f35d99..82d8cd2cf1 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt @@ -192,7 +192,6 @@ internal fun RoomDetailsTopBar( Icon(Icons.Default.MoreVert, "") } DropdownMenu( - modifier = Modifier.widthIn(200.dp), expanded = showMenu, onDismissRequest = { showMenu = false }, ) { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt index de02f47a22..88a0f7cb49 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt @@ -17,12 +17,15 @@ package io.element.android.libraries.designsystem.theme.components import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.widthIn import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.window.PopupProperties +private val minMenuWidth = 200.dp + @Composable fun DropdownMenu( expanded: Boolean, @@ -36,7 +39,7 @@ fun DropdownMenu( androidx.compose.material3.DropdownMenu( expanded = expanded, onDismissRequest = onDismissRequest, - modifier = modifier, + modifier = modifier.widthIn(min = minMenuWidth), offset = offset, properties = properties, content = content