From 5a0d27b24a42a94f5b0a103e7439624b80c4729d Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Mon, 11 Dec 2023 09:58:05 -0800 Subject: [PATCH] Fix tree colours being mixed up (#266) --- .../styling/IntUiLazyTreeStyling.kt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt index 2a44e456d..2f9981996 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt @@ -42,13 +42,13 @@ public fun LazyTreeColors.Companion.light( nodeBackgroundSelectedFocused: Color = IntUiLightTheme.colors.blue(11), ): LazyTreeColors = LazyTreeColors( - elementBackgroundFocused = content, - elementBackgroundSelected = contentFocused, - elementBackgroundSelectedFocused = contentSelected, - content = contentSelectedFocused, - contentFocused = nodeBackgroundFocused, - contentSelected = nodeBackgroundSelected, - contentSelectedFocused = nodeBackgroundSelectedFocused, + elementBackgroundFocused = nodeBackgroundFocused, + elementBackgroundSelected = nodeBackgroundSelected, + elementBackgroundSelectedFocused = nodeBackgroundSelectedFocused, + content = content, + contentFocused = contentFocused, + contentSelected = contentSelected, + contentSelectedFocused = contentSelectedFocused, ) @Composable @@ -62,13 +62,13 @@ public fun LazyTreeColors.Companion.dark( nodeBackgroundSelectedFocused: Color = IntUiDarkTheme.colors.blue(2), ): LazyTreeColors = LazyTreeColors( - elementBackgroundFocused = content, - elementBackgroundSelected = contentFocused, - elementBackgroundSelectedFocused = contentSelected, - content = contentSelectedFocused, - contentFocused = nodeBackgroundFocused, - contentSelected = nodeBackgroundSelected, - contentSelectedFocused = nodeBackgroundSelectedFocused, + elementBackgroundFocused = nodeBackgroundFocused, + elementBackgroundSelected = nodeBackgroundSelected, + elementBackgroundSelectedFocused = nodeBackgroundSelectedFocused, + content = content, + contentFocused = contentFocused, + contentSelected = contentSelected, + contentSelectedFocused = contentSelectedFocused, ) public fun LazyTreeMetrics.Companion.defaults(