Combobox renderer is back to SimpleListCellRenderer

GitOrigin-RevId: ca568884c4bc3bd4b29528e8f9c7900080cfcd25
This commit is contained in:
Dmitry Jemerov
2019-07-04 01:31:35 +03:00
committed by intellij-monorepo-bot
parent 021f76c90a
commit 9ad3e1fdab
2 changed files with 6 additions and 6 deletions
@@ -227,7 +227,7 @@ internal class PasswordSafeConfigurableUi(private val mySettings: PasswordSafeSe
{ getSelectedPgpKey() ?: pgpListModel.items.firstOrNull() },
{ mySettings.state.pgpKeyId = if (usePgpKey.isSelected) it?.keyId else null },
growPolicy = GrowPolicy.MEDIUM_TEXT,
renderer = listCellRenderer { value, _, _ -> append("${value.userId} (${value.keyId})") }
renderer = listCellRenderer { value, _, _ -> setText("${value.userId} (${value.keyId})") }
)
.enableIf(usePgpKey.selected)
.component
@@ -221,8 +221,8 @@ abstract class Cell {
fun <T> comboBox(model: ComboBoxModel<T>,
modelBinding: PropertyBinding<T?>,
growPolicy: GrowPolicy?,
renderer: ListCellRenderer<T?>?): CellBuilder<ComboBox<T>> {
growPolicy: GrowPolicy? = null,
renderer: ListCellRenderer<T?>? = null): CellBuilder<ComboBox<T>> {
val component = ComboBox(model)
if (renderer != null) {
component.renderer = renderer
@@ -376,9 +376,9 @@ abstract class Cell {
}
fun <T> listCellRenderer(renderer: ColoredListCellRenderer<T?>.(value: T, index: Int, isSelected: Boolean) -> Unit): ColoredListCellRenderer<T?> {
return object : ColoredListCellRenderer<T?>() {
override fun customizeCellRenderer(list: JList<out T?>, value: T?, index: Int, selected: Boolean, hasFocus: Boolean) {
fun <T> listCellRenderer(renderer: SimpleListCellRenderer<T?>.(value: T, index: Int, isSelected: Boolean) -> Unit): SimpleListCellRenderer<T?> {
return object : SimpleListCellRenderer<T?>() {
override fun customize(list: JList<out T?>, value: T?, index: Int, selected: Boolean, hasFocus: Boolean) {
if (value != null) {
renderer(this, value, index, selected)
}