From 94a5eb53e0968b5493bc87bc46210401d5a4ee8a Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Wed, 29 Nov 2023 20:20:46 +0800 Subject: [PATCH] refactor: replace DefaultDropdownListMenuOffset with padding in Dropdown --- .../kotlin/com/highcapable/flexiui/component/Dropdown.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt index 6bf6a70..8829953 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt @@ -107,6 +107,8 @@ import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.calculateEnd +import com.highcapable.flexiui.extension.calculateStart import com.highcapable.flexiui.extension.horizontal import com.highcapable.flexiui.extension.orElse import com.highcapable.flexiui.extension.solidColor @@ -224,7 +226,7 @@ fun DropdownList( DropdownMenu( expanded = expanded, onDismissRequest = { onExpandedChange(false) }, - offset = DefaultDropdownListMenuOffset, + offset = DpOffset(-style.padding.calculateStart(), style.padding.calculateEnd()), modifier = Modifier.width(menuMaxWidth).heightIn(max = menuMaxHeight), colors = menuColors, style = menuStyle, @@ -595,8 +597,6 @@ private fun defaultDropdownListInactiveBorder() = BorderStroke(LocalSizes.curren @ReadOnlyComposable private fun defaultDropdownListActiveBorder() = BorderStroke(LocalSizes.current.borderSizePrimary, LocalColors.current.themePrimary) -private val DefaultDropdownListMenuOffset = DpOffset((-10).dp, 10.dp) - private val DefaultMenuContentPadding = 16.dp private const val DefaultInTransitionDuration = 120