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

refactor: merge PaddingValues to ComponentPadding in DesktopContextMenu

Browse Source
This commit is contained in:
fankesyooni
2023-12-04 00:15:37 +08:00
parent a73ca55a2c
commit 5524bc8686
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import androidx.compose.foundation.ContextMenuItem
import androidx.compose.foundation.ContextMenuRepresentation import androidx.compose.foundation.ContextMenuRepresentation
import androidx.compose.foundation.ContextMenuState import androidx.compose.foundation.ContextMenuState
import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.layout.sizeIn
@@ -64,6 +63,7 @@ import androidx.compose.ui.window.rememberPopupPositionProviderAtPosition
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalShapes
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.extension.ComponentPadding
import com.highcapable.flexiui.extension.orElse import com.highcapable.flexiui.extension.orElse
import com.highcapable.flexiui.interaction.rippleClickable import com.highcapable.flexiui.interaction.rippleClickable
import java.awt.event.KeyEvent import java.awt.event.KeyEvent
@@ -208,11 +208,11 @@ internal fun defaultContextMenuColors() = ContextMenuColors(
@ReadOnlyComposable @ReadOnlyComposable
internal fun defaultContextMenuStyle() = ContextMenuStyle( internal fun defaultContextMenuStyle() = ContextMenuStyle(
contentStyle = LocalContextMenuStyle.current.contentStyle ?: AreaBox.style.copy( contentStyle = LocalContextMenuStyle.current.contentStyle ?: AreaBox.style.copy(
padding = PaddingValues(horizontal = DefaultMenuContentPadding), padding = ComponentPadding(horizontal = DefaultMenuContentPadding),
shape = LocalShapes.current.secondary shape = LocalShapes.current.secondary
), ),
borderStyle = LocalContextMenuStyle.current.borderStyle ?: AreaBox.style.copy( borderStyle = LocalContextMenuStyle.current.borderStyle ?: AreaBox.style.copy(
padding = PaddingValues(LocalSizes.current.spacingTertiary), padding = ComponentPadding(LocalSizes.current.spacingTertiary),
shadowSize = LocalSizes.current.zoomSizeTertiary, shadowSize = LocalSizes.current.zoomSizeTertiary,
shape = LocalShapes.current.primary shape = LocalShapes.current.primary
) )