fix spacing between components

Author: vol0n

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/UTBotBaseWizardStep.kt

@@ -3,12 +3,15 @@ package org.utbot.cpp.clion.plugin.ui.wizard
 import com.intellij.ide.wizard.Step
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.util.ui.HtmlPanel
+import com.intellij.util.ui.UIUtil
+import javax.swing.Box
 import javax.swing.BoxLayout
 import javax.swing.Icon
 import javax.swing.JComponent
 import javax.swing.JPanel
 import java.awt.Component
 import java.awt.Dimension
+import java.awt.Font
 
 abstract class UTBotBaseWizardStep : Step {
     private val panel by lazy { JPanel() }
@@ -21,18 +24,19 @@ abstract class UTBotBaseWizardStep : Step {
     override fun _init() {
         if (!isInitialized) {
             panel.layout = BoxLayout(panel, BoxLayout.Y_AXIS)
-            panel.preferredSize = Dimension(800, 400)
+            panel.preferredSize = Dimension(STEP_WIDTH, STEP_HEIGHT)
             panel.minimumSize = panel.preferredSize
             createUI()
+            panel.add(Box.createVerticalGlue())
 
             isInitialized = true
         }
     }
 
-    fun DialogPanel.addToUI() {
-        alignmentX = Component.LEFT_ALIGNMENT
-        panel.add(this)
+    protected fun DialogPanel.addToUI() {
+        this.maximumSize = Dimension(maximumSize.width, minimumSize.height)
         onApplyCallbacks.add { apply() }
+        addComponentToStep(this)
     }
 
     override fun _commit(finishChosen: Boolean) = onApplyCallbacks.forEach { it.invoke() }
@@ -44,30 +48,42 @@ abstract class UTBotBaseWizardStep : Step {
 
     override fun getPreferredFocusedComponent(): JComponent? = panel
 
-    fun addHtml(htmlResource: String) {
+    protected fun addHtml(htmlResource: String) {
         val text = this.javaClass.classLoader.getResource(htmlResource)?.readText()
             ?: error("Unable to get resource: $htmlResource")
-        panel.add(createHtmlComponent(text))
+        addComponentToStep(createHtmlComponent(text))
+    }
+
+    private fun addComponentToStep(component: JComponent) {
+        // From BoxLayout docs: all components should have the same alignmentX
+        component.alignmentX = Component.LEFT_ALIGNMENT
+        panel.add(component)
     }
 
     open fun canProceedToNextStep(): Boolean = true
 
     private fun createHtmlComponent(html: String): JComponent = object : HtmlPanel() {
         init {
             update()
-            alignmentX = Component.LEFT_ALIGNMENT
-            adjustHeightToTextHeight()
+            adjustHeightToTextHeight(STEP_WIDTH)
         }
 
+        override fun getBodyFont(): Font = UIUtil.getButtonFont().deriveFont(Font.PLAIN)
         override fun getBody() = html
 
-        fun adjustHeightToTextHeight() {
-            // set dummy size, to update preferred
-            size = Dimension(100, Short.MAX_VALUE.toInt())
+        fun adjustHeightToTextHeight(parentWidth: Int) {
+            // to use modelToView2D the size of JTextComponent must be > 0
             size = preferredSize
-            minimumSize = preferredSize
+            val rectangleWrappingText = modelToView2D(document.length)
+            preferredSize =
+                Dimension(parentWidth, rectangleWrappingText.y.toInt() + rectangleWrappingText.height.toInt())
             maximumSize = preferredSize
             update()
         }
     }
+
+    companion object {
+        private const val STEP_HEIGHT = 400
+        private const val STEP_WIDTH = 800
+    }
 }

clion-plugin/src/main/resources/media/installation.html

@@ -1,7 +1,7 @@
 <h2>🖥️ Server Installation</h2>
 <p> If you are working on remote machine you can start UTBot Server installation
-    right from here. Otherwise, please do it manually. </p>
-<p> In order to learn more about UTBot Server Installation process,
+    right from here. Otherwise, please do it manually.
+ In order to learn more about UTBot Server Installation process,
     please, refer to the
     <a href="https://github.com/UnitTestBot/UTBotCpp/wiki/install-server">installation manual</a>.
 </p>