keybindings

JetBrains · Dec 11, 2023 · 300ae3e · 300ae3e
1 parent 57c4356
commit 300ae3e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/...dalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Dropdowns.kt b/...dalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Dropdowns.kt
@@ -15,6 +15,7 @@ import org.jetbrains.jewel.ui.component.Dropdown
 import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.separator
 import org.jetbrains.jewel.ui.component.styling.DropdownStyle
+import kotlin.random.Random
 
 @Composable
 @View(title = "Dropdowns", position = 3)
@@ -118,8 +119,11 @@ fun Dropdowns() {
                         separator()
                     } else {
                         selectableItem(
-                            iconResource = dropdownIcons.random(),
+                            iconResource = dropdownIconsSample.random(),
                             iconClass = DropdownStyle::class.java,
+                            keybinding = if (Random.nextBoolean()) null else dropdownKeybindingsSample.shuffled()
+                                .take(2)
+                                .toSet(),
                             selected = false,
                             onClick = { }
                         ) {
@@ -133,8 +137,11 @@ fun Dropdowns() {
                             separator()
                         } else {
                             selectableItem(
-                                iconResource = dropdownIcons.random(),
+                                iconResource = dropdownIconsSample.random(),
                                 iconClass = DropdownStyle::class.java,
+                                keybinding = if (Random.nextBoolean()) null else dropdownKeybindingsSample.shuffled()
+                                    .take(2)
+                                    .toSet(),
                                 selected = false,
                                 onClick = { }
                             ) {
@@ -149,7 +156,7 @@ fun Dropdowns() {
                                 separator()
                             } else {
                                 selectableItem(
-                                    iconResource = dropdownIcons.random(),
+                                    iconResource = dropdownIconsSample.random(),
                                     iconClass = DropdownStyle::class.java,
                                     selected = false,
                                     onClick = { }
@@ -171,4 +178,5 @@ fun Dropdowns() {
     }
 }
 
-private val dropdownIcons = listOf("icons/search.svg", "icons/close.svg", null)
+private val dropdownIconsSample = listOf("icons/search.svg", "icons/close.svg", null)
+private val dropdownKeybindingsSample = setOf('A', 'B', '↑', '→', '␡')
diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt
@@ -426,17 +426,22 @@ internal fun MenuItem(
                         Box(modifier = Modifier.size(16.dp)) // todo 16 dp move to style.metrics.iconSize
                     }
                 }
-                content()
+                Box(modifier = Modifier.weight(1f, true)) {
+                    content()
+                }
                 if (keybindingGap) {
                     val keybindingText = keybinding?.joinToString("+") { it.toString() } ?: ""
-                    Text(keybindingText)
+                    Text(
+                        modifier = Modifier.padding(start = 4.dp),
+                        text = keybindingText,
+                        color = style.colors.itemColors.iconTint
+                    )
                 }
             }
         }
     }
 }
 
-
 @Composable
 public fun MenuSubmenuItem(
     modifier: Modifier = Modifier,