From b8d57ad73587075f1271cc7fb64ba69aede3f0c6 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 2 Dec 2023 12:03:00 +0800 Subject: [PATCH] fix: defaultIconButtonColors -> contentColor use LocalIconTint in Button --- .../kotlin/com/highcapable/flexiui/component/Button.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt index 2292ee4..6dc3c75 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt @@ -48,6 +48,7 @@ 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.orElse import com.highcapable.flexiui.extension.status import com.highcapable.flexiui.interaction.Interaction import com.highcapable.flexiui.interaction.RippleStyle @@ -243,7 +244,7 @@ private fun defaultButtonStyle() = ButtonStyle( @Composable @ReadOnlyComposable private fun defaultIconButtonColors() = ButtonColors( - contentColor = LocalColors.current.themePrimary, + contentColor = LocalIconTint.current.orElse() ?: LocalColors.current.themePrimary, backgroundColor = Color.Transparent )