From ddc5590a579982132557ae195a2486446c0632b6 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 2 Dec 2023 21:48:16 +0800 Subject: [PATCH] refactor: merge style.actionIconMaxSize to LocalIconStyle in ActionBar --- .../kotlin/com/highcapable/flexiui/component/ActionBar.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt index 0f7d374..fdae502 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt @@ -179,8 +179,9 @@ class BasicActionBar internal constructor( val iconInflateSize = style.actionIconMaxSize + style.actionIconPadding IconButton( onClick = onClick, - modifier = Modifier.size(iconInflateSize).then(modifier) - ) { Box(modifier = Modifier.size(style.actionIconMaxSize)) { content() } } + modifier = Modifier.size(iconInflateSize).then(modifier), + content = content + ) } @Composable @@ -261,7 +262,7 @@ class BasicActionBar internal constructor( content: @Composable () -> Unit ) { CompositionLocalProvider( - LocalIconStyle provides LocalIconStyle.current.copy(tint = color), + LocalIconStyle provides LocalIconStyle.current.copy(size = style.actionIconMaxSize, tint = color), LocalTextStyle provides LocalTextStyle.current.merge(textStyle ?: LocalTextStyle.current).copy(color = color), content = content )