Merge pull request #451 from eyedol/eyedol/hideDropdownBorder

Hide dropdown border if no gradle tasks exists
takahirom · Jul 28, 2024 · 4c4de49 · 4c4de49
2 parents 430f8ad + a579364
commit 4c4de49
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/...ea-plugin/src/main/kotlin/com/github/takahirom/roborazzi/idea/preview/TaskToolbarPanel.kt b/...ea-plugin/src/main/kotlin/com/github/takahirom/roborazzi/idea/preview/TaskToolbarPanel.kt
@@ -18,16 +18,18 @@ import com.intellij.openapi.util.Key
 import com.intellij.ui.components.JBBox
 import com.intellij.ui.components.JBPanel
 import com.intellij.util.ui.JBUI
+import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.GridBagConstraints
-import java.awt.GridBagLayout
 import javax.swing.BorderFactory
 import javax.swing.JComponent
 
 class TaskToolbarPanel(
   project: Project,
   onTaskExecuteButtonClicked: (taskName: String) -> Unit
-) : JBPanel<JBPanel<*>>(GridBagLayout()) {
+) : JBPanel<JBPanel<*>>(BorderLayout()) {
+
+  private val jbBox = JBBox.createHorizontalBox()
   private val actionToolbar = RoborazziGradleTaskToolbar(
     project = project,
     place = "RoborazziGradleTaskToolbar",
@@ -43,28 +45,24 @@ class TaskToolbarPanel(
 
   init {
     actionToolbar.setTargetComponent(this)
-    setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4))
-    val actionToolbarConstraints = GridBagConstraints().apply {
-      insets = JBUI.insets(4)
-      gridx = 0
-      gridy = 0
-      anchor = GridBagConstraints.WEST
-    }
-    add(actionToolbar.component, actionToolbarConstraints)
-    add(JBBox.createHorizontalGlue(), GridBagConstraints().apply {
-      gridx = 1
-      gridy = 0
-      weightx = 1.0
-      fill = GridBagConstraints.HORIZONTAL
-    })
+    add(jbBox.apply {
+      isVisible = false
+      setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4))
+      add(actionToolbar.component, GridBagConstraints().apply {
+        gridx = 0
+        gridy = 0
+        anchor = GridBagConstraints.WEST
+        insets = JBUI.insets(4)
+      })
+    }, BorderLayout.WEST)
   }
 
   fun setActions(actions: List<ToolbarAction>) {
     if (actions.isEmpty()) {
-      actionToolbar.isVisible = false
+      jbBox.isVisible = false
       return
     }
-    actionToolbar.isVisible = true
+    jbBox.isVisible = true
     val actionList = listOf(*actions.toTypedArray())
     actionToolbar.setActions(actionList)
   }