From f640477464b86276d2740409b94c6adf2aa9fb6e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 16 Mar 2020 15:31:53 +0300 Subject: [PATCH] Wizard: fix layout --- .../ui/firstStep/ProjectTemplateSettingComponent.kt | 12 +++++------- .../ui/secondStep/modulesEditor/ModulesEditorTree.kt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt index 8c6ac3bd286..7c59653749c 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.firstStep +import com.intellij.ui.JBColor import com.intellij.util.ui.JBUI import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.tools.projectWizard.core.Context @@ -31,15 +32,12 @@ class ProjectTemplateSettingComponent( append(value.title) }, onValueSelected = { value = it } - ).bordered(needTopEmptyBorder = false, needInnerEmptyBorder = false, needBottomEmptyBorder = false) + ).addBorder(JBUI.Borders.customLine(JBColor.border())) - override val component: JComponent = panel { - add(list, BorderLayout.CENTER) - add( - templateDescriptionComponent.component.addBorder(JBUI.Borders.emptyTop(5)), - BorderLayout.SOUTH - ) + override val component: JComponent = borderPanel { + addToCenter(borderPanel { addToCenter(list) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3))) + addToBottom(templateDescriptionComponent.component.addBorder(JBUI.Borders.empty(/*top*/5,/*left*/ 3, 0, 0))) } private fun applySelectedTemplate() = modify { diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorTree.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorTree.kt index fb3ebade5ff..fb400491276 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorTree.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorTree.kt @@ -96,7 +96,7 @@ class ModulesEditorTree( append(setting.text) setting.greyText?.let { greyText -> append(" ") - append("($greyText)", SimpleTextAttributes.GRAYED_ATTRIBUTES) + append(greyText, SimpleTextAttributes.GRAYED_ATTRIBUTES) } } })