From 3cf432e2c8a649054e6c924c18464b9601152cfd Mon Sep 17 00:00:00 2001 From: Ivan Morgillo Date: Tue, 14 Jan 2025 16:34:12 +0100 Subject: [PATCH] fix disabled state dropdown menu item color in IDE reference https://github.com/JetBrains/jewel/pull/717 closes https://github.com/JetBrains/intellij-community/pull/2904 (cherry picked from commit 025558652bb64c35aad8e725d7186e564bc99684) (cherry picked from commit 8759e143a4db37b981a26ec9e117b83376d06b97) IJ-MR-155570 GitOrigin-RevId: b32476fcae67b494143cae0f9b3aafb877a90e2c --- .../main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt index c76b78a70c4f..d74492d9318b 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt @@ -75,6 +75,7 @@ import org.jetbrains.jewel.foundation.state.FocusableComponentState import org.jetbrains.jewel.foundation.state.SelectableComponentState import org.jetbrains.jewel.foundation.theme.JewelTheme import org.jetbrains.jewel.foundation.theme.LocalContentColor +import org.jetbrains.jewel.foundation.theme.LocalTextStyle import org.jetbrains.jewel.foundation.theme.OverrideDarkMode import org.jetbrains.jewel.ui.Orientation import org.jetbrains.jewel.ui.component.styling.LocalMenuStyle @@ -397,7 +398,11 @@ internal fun MenuItem( val itemColors = style.colors.itemColors val itemMetrics = style.metrics.itemMetrics - CompositionLocalProvider(LocalContentColor provides itemColors.contentFor(itemState).value) { + val updatedTextStyle = LocalTextStyle.current.copy(color = itemColors.contentFor(itemState).value) + CompositionLocalProvider( + LocalContentColor provides itemColors.contentFor(itemState).value, + LocalTextStyle provides updatedTextStyle, + ) { val backgroundColor by itemColors.backgroundFor(itemState) Row(