From aea4f346831c7706c540ebb0452e540bc6c28bfd Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 23 Mar 2018 15:33:08 +0100 Subject: [PATCH] UI DSL: remove verticalPanel to simplify implementation and DSL --- .../platform-impl/src/com/intellij/ui/layout/layout.kt | 5 ----- plugins/settings-repository/src/IcsConfigurable.kt | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/layout/layout.kt b/platform/platform-impl/src/com/intellij/ui/layout/layout.kt index 965c003bc87d..7da21e56273a 100644 --- a/platform/platform-impl/src/com/intellij/ui/layout/layout.kt +++ b/platform/platform-impl/src/com/intellij/ui/layout/layout.kt @@ -2,7 +2,6 @@ package com.intellij.ui.layout import com.intellij.ui.components.Panel -import com.intellij.ui.layout.LCFlags.* import javax.swing.JPanel /** @@ -23,8 +22,4 @@ inline fun panel(vararg constraints: LCFlags, title: String? = null, init: Layou val panel = Panel(title, layout = null) builder.builder.build(panel, constraints) return panel -} - -inline fun verticalPanel(init: Row.() -> Unit) = panel(noGrid, flowY, fillX) { - row(init = init) } \ No newline at end of file diff --git a/plugins/settings-repository/src/IcsConfigurable.kt b/plugins/settings-repository/src/IcsConfigurable.kt index ab7c1f330f82..ca07da0c526f 100644 --- a/plugins/settings-repository/src/IcsConfigurable.kt +++ b/plugins/settings-repository/src/IcsConfigurable.kt @@ -49,9 +49,9 @@ internal class IcsConfigurableUi : ConfigurableUi, Disposable { saveSettings(settings, icsManager.settingsFile) } - override fun getComponent() = verticalPanel { - editors.get(0).component() - autoSync(comment = "Use VCS -> Sync Settings to sync when you want") - panel("Read-only Sources", editors.get(1).component) + override fun getComponent() = panel { + row { editors.get(0).component() } + row { autoSync(comment = "Use VCS -> Sync Settings to sync when you want") } + row { panel("Read-only Sources", editors.get(1).component) } } } \ No newline at end of file