From 2a5679e0c60cdd7cea6f8a110a291127f0d638c9 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 1 Oct 2020 16:04:06 +0300 Subject: [PATCH] Wizard: make project templates list scrollable --- .../wizard/ui/firstStep/FirstWizardStepComponent.kt | 5 +---- .../wizard/ui/firstStep/ProjectTemplateSettingComponent.kt | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt index ffb57b72a45..099d1daec1f 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt @@ -77,7 +77,7 @@ class ProjectSettingsComponent(ideWizard: IdeWizard) : DynamicComponent(ideWizar ).asSubComponent() override val component: JComponent by lazy(LazyThreadSafetyMode.NONE) { - val panel = panel { + panel { row { nameAndLocationComponent.component(growX) } @@ -85,9 +85,6 @@ class ProjectSettingsComponent(ideWizard: IdeWizard) : DynamicComponent(ideWizar buildSystemAdditionalSettingsComponent.component(growX) } }.addBorder(JBUI.Borders.emptyRight(UIConstants.PADDING)) - ScrollPaneFactory.createScrollPane(panel, true).apply { - viewport.background = JBColor.PanelBackground - } } override fun onValueUpdated(reference: SettingReference<*, *>?) { 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 9bf383882b3..1d192581951 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 @@ -47,10 +47,10 @@ class ProjectTemplateSettingComponent( override val alignment: TitleComponentAlignment get() = TitleComponentAlignment.AlignFormTopWithPadding(4) - private val borderedPanel = list.addBorder(BorderFactory.createLineBorder(JBColor.border())) + private val scrollPane = ScrollPaneFactory.createScrollPane(list) override val component: JComponent = borderPanel { - addToCenter(borderPanel { addToCenter(list) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3))) + addToCenter(borderPanel { addToCenter(scrollPane) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3))) addToBottom(templateDescriptionComponent.component.addBorder(JBUI.Borders.empty(/*top*/8,/*left*/ 3, 0, 0))) } @@ -93,6 +93,7 @@ private val ProjectTemplate.icon: Icon MultiplatformMobileApplicationProjectTemplate -> KotlinIcons.Wizard.MULTIPLATFORM_MOBILE MultiplatformMobileLibraryProjectTemplate -> KotlinIcons.Wizard.MULTIPLATFORM_MOBILE_LIBRARY NodeJsApplicationProjectTemplate -> KotlinIcons.Wizard.NODE_JS + ComposeDesktopApplicationProjectTemplate -> KotlinIcons.Wizard.COMPOSE } class TemplateDescriptionComponent : Component() {