BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-12-12 09:13:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: split shape into contentShape / borderShape in desktop context menu style

Browse Source
This commit is contained in:
fankesyooni
2023-11-11 23:23:25 +08:00
parent 5744356d7f
commit e42d117d22
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt
View File

@@ -84,7 +84,8 @@ data class ContextMenuStyle(
val textColor: Color, val textColor: Color,
val padding: Dp, val padding: Dp,
val shadowSize: Dp, val shadowSize: Dp,
val shape: Shape? val contentShape: Shape?,
val borderShape: Shape?
) )
internal class DesktopContextMenuRepresentation(private val style: ContextMenuStyle) : ContextMenuRepresentation { internal class DesktopContextMenuRepresentation(private val style: ContextMenuStyle) : ContextMenuRepresentation {
@@ -93,7 +94,8 @@ internal class DesktopContextMenuRepresentation(private val style: ContextMenuSt
override fun Representation(state: ContextMenuState, items: () -> List<ContextMenuItem>) { override fun Representation(state: ContextMenuState, items: () -> List<ContextMenuItem>) {
val status = state.status val status = state.status
if (status is ContextMenuState.Status.Open) { if (status is ContextMenuState.Status.Open) {
val shape = style.shape ?: return val contentShape = style.contentShape ?: return
val borderShape = style.borderShape ?: return
var focusManager: FocusManager? by mutableStateOf(null) var focusManager: FocusManager? by mutableStateOf(null)
var inputModeManager: InputModeManager? by mutableStateOf(null) var inputModeManager: InputModeManager? by mutableStateOf(null)
Popup( Popup(
@@ -120,15 +122,15 @@ internal class DesktopContextMenuRepresentation(private val style: ContextMenuSt
inputModeManager = LocalInputModeManager.current inputModeManager = LocalInputModeManager.current
Column( Column(
modifier = Modifier modifier = Modifier
.shadow(elevation = style.shadowSize, shape = shape) .shadow(style.shadowSize, borderShape)
.background(color = style.backgroundColor, shape = shape) .background(style.backgroundColor, borderShape)
.padding(style.padding) .padding(style.padding)
.width(IntrinsicSize.Max) .width(IntrinsicSize.Max)
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
) { ) {
items().forEach { item -> items().forEach { item ->
MenuItemContent( MenuItemContent(
shape = shape, shape = contentShape,
onClick = { onClick = {
state.status = ContextMenuState.Status.Closed state.status = ContextMenuState.Status.Closed
item.onClick() item.onClick()
@@ -198,7 +200,8 @@ val LocalContextMenuStyle = compositionLocalOf {
textColor = Color.Unspecified, textColor = Color.Unspecified,
padding = Dp.Unspecified, padding = Dp.Unspecified,
shadowSize = Dp.Unspecified, shadowSize = Dp.Unspecified,
shape = null contentShape = null,
borderShape = null
) )
} }
@@ -209,5 +212,6 @@ internal fun defaultContextMenuStyle() = ContextMenuStyle(
textColor = LocalContextMenuStyle.current.textColor.orElse() ?: LocalColors.current.textPrimary, textColor = LocalContextMenuStyle.current.textColor.orElse() ?: LocalColors.current.textPrimary,
padding = LocalContextMenuStyle.current.padding.orElse() ?: LocalSizes.current.spacingTertiary, padding = LocalContextMenuStyle.current.padding.orElse() ?: LocalSizes.current.spacingTertiary,
shadowSize = LocalContextMenuStyle.current.shadowSize.orElse() ?: LocalSizes.current.zoomSizeTertiary, shadowSize = LocalContextMenuStyle.current.shadowSize.orElse() ?: LocalSizes.current.zoomSizeTertiary,
shape = LocalContextMenuStyle.current.shape ?: LocalShapes.current.primary contentShape = LocalContextMenuStyle.current.contentShape ?: LocalShapes.current.secondary,
borderShape = LocalContextMenuStyle.current.borderShape ?: LocalShapes.current.primary
) )