From f34e4f615803ce051a56448ca233a51cea3ff87d Mon Sep 17 00:00:00 2001 From: Vera Petrenkova Date: Wed, 29 Jan 2025 17:37:52 +0100 Subject: [PATCH] IJPL-175936 fix combobox rendering GitOrigin-RevId: de745e98fab7f196598de53db32995361e64896e --- .../src/com/intellij/ide/ui/MainMenuDisplayMode.kt | 2 ++ .../src/com/intellij/ide/ui/AppearanceConfigurable.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/MainMenuDisplayMode.kt b/platform/editor-ui-api/src/com/intellij/ide/ui/MainMenuDisplayMode.kt index 238e0550c71b..9cfb4ac03ab3 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/ui/MainMenuDisplayMode.kt +++ b/platform/editor-ui-api/src/com/intellij/ide/ui/MainMenuDisplayMode.kt @@ -16,4 +16,6 @@ enum class MainMenuDisplayMode(@NlsActions.ActionText val description: String) { companion object { fun valueOf(name: String?): MainMenuDisplayMode = MainMenuDisplayMode.entries.find { it.name.equals(name, true)} ?: UNDER_HAMBURGER_BUTTON } + + override fun toString(): String = description } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt index a8929cf18f35..22b4f5ed1e66 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt @@ -459,7 +459,7 @@ internal class AppearanceConfigurable : BoundSearchableConfigurable(message("tit if (!SystemInfo.isMac && ExperimentalUI.isNewUI()) { row { - comboBox(model = CollectionComboBoxModel(MainMenuDisplayMode.entries), SimpleListCellRenderer.create { label, value, _ -> label.text = value.description } ) + comboBox(model = CollectionComboBoxModel(MainMenuDisplayMode.entries)/* SimpleListCellRenderer.create { label, value, _ -> label.text = value.description }*/ ) .label(message("main.menu.combobox.label")) .bindItem(settings::mainMenuDisplayMode.toNullableProperty()) .apply {