stitch IDE sample

Signed-off-by: Ivan Morgillo <[email protected]>
JetBrains · Oct 16, 2024 · c40889a · c40889a
1 parent 120ff2e
commit c40889a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/...e-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/SwingComparisonTabPanel.kt b/...e-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/SwingComparisonTabPanel.kt
@@ -42,16 +42,13 @@ import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.components.BorderLayoutPanel
 import icons.IdeSampleIconKeys
 import icons.JewelIcons
-import javax.swing.BoxLayout
-import javax.swing.DefaultComboBoxModel
-import javax.swing.JLabel
-import javax.swing.JPanel
 import org.jetbrains.jewel.bridge.JewelComposePanel
 import org.jetbrains.jewel.bridge.medium
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.DefaultButton
 import org.jetbrains.jewel.ui.component.Icon
 import org.jetbrains.jewel.ui.component.ListComboBox
+import org.jetbrains.jewel.ui.component.ListItemState
 import org.jetbrains.jewel.ui.component.OutlinedButton
 import org.jetbrains.jewel.ui.component.SimpleListItem
 import org.jetbrains.jewel.ui.component.Text
@@ -60,6 +57,10 @@ import org.jetbrains.jewel.ui.component.TextField
 import org.jetbrains.jewel.ui.component.Typography
 import org.jetbrains.jewel.ui.theme.comboBoxStyle
 import org.jetbrains.jewel.ui.theme.textAreaStyle
+import javax.swing.BoxLayout
+import javax.swing.DefaultComboBoxModel
+import javax.swing.JLabel
+import javax.swing.JPanel
 
 internal class SwingComparisonTabPanel : BorderLayoutPanel() {
     private val mainContent =
@@ -259,8 +260,7 @@ internal class SwingComparisonTabPanel : BorderLayoutPanel() {
                                 listItemContent = { item, isSelected, isFocused, isItemHovered, isListHovered ->
                                     SimpleListItem(
                                         text = item,
-                                        isSelected = isSelected,
-                                        isHovered = isItemHovered,
+                                        state = ListItemState(isSelected, isListHovered, isItemHovered),
                                         style = JewelTheme.comboBoxStyle.itemStyle,
                                         contentDescription = item,
                                     )
@@ -280,8 +280,7 @@ internal class SwingComparisonTabPanel : BorderLayoutPanel() {
                                 listItemContent = { item, isSelected, isFocused, isItemHovered, isListHovered ->
                                     SimpleListItem(
                                         text = item,
-                                        isSelected = isSelected,
-                                        isHovered = isItemHovered,
+                                        state = ListItemState(isSelected, isListHovered, isItemHovered),
                                         style = JewelTheme.comboBoxStyle.itemStyle,
                                         contentDescription = item,
                                     )
@@ -300,8 +299,7 @@ internal class SwingComparisonTabPanel : BorderLayoutPanel() {
                                 listItemContent = { item, isSelected, isFocused, isItemHovered, isListHovered ->
                                     SimpleListItem(
                                         text = item,
-                                        isSelected = isSelected,
-                                        isHovered = isItemHovered,
+                                        state = ListItemState(isSelected, isListHovered, isItemHovered),
                                         style = JewelTheme.comboBoxStyle.itemStyle,
                                         contentDescription = item,
                                     )

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ListComboBox.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ListComboBox.kt
@@ -45,7 +45,6 @@ public fun ListComboBox(
     var selectedItem by remember { mutableIntStateOf(0) }
     var isListHovered by remember { mutableStateOf(false) }
     var hoverItemIndex by remember { mutableStateOf(-1) }
-    var softSelection by remember { mutableStateOf(isListHovered) }
     val scope = rememberCoroutineScope()
 
     LaunchedEffect(selectedItem) { scrollState.selectedKeys = setOf(items[selectedItem]) }