Adjust the icon alignments (#141)

Author: skydoves

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/cascade/CascadePanel.kt

@@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.application.ApplicationManager
+import com.skydoves.compose.stability.idea.toolwindow.combineToolbars
 import com.intellij.openapi.editor.ScrollType
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.progress.ProgressIndicator
@@ -170,11 +171,11 @@ internal class CascadePanel(private val project: Project) {
     actionGroup.add(RefreshAction())
     actionGroup.add(ClearAction())
 
-    val toolbar = ActionManager.getInstance()
+    val tabToolbar = ActionManager.getInstance()
       .createActionToolbar(ActionPlaces.TOOLBAR, actionGroup, true)
-    toolbar.targetComponent = tree
+    tabToolbar.targetComponent = tree
 
-    return toolbar.component
+    return combineToolbars(tabToolbar.component, tree)
   }
 
   private fun navigateToSource(node: CascadeNode) {

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/heatmap/HeatmapPanel.kt

@@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.project.Project
+import com.skydoves.compose.stability.idea.toolwindow.combineToolbars
 import com.intellij.openapi.ui.SimpleToolWindowPanel
 import com.intellij.ui.ColoredTreeCellRenderer
 import com.intellij.ui.ScrollPaneFactory
@@ -160,11 +161,11 @@ internal class HeatmapPanel(private val project: Project) {
     actionGroup.add(RefreshAction())
     actionGroup.add(ClearAction())
 
-    val toolbar = ActionManager.getInstance()
+    val tabToolbar = ActionManager.getInstance()
       .createActionToolbar(ActionPlaces.TOOLBAR, actionGroup, true)
-    toolbar.targetComponent = tree
+    tabToolbar.targetComponent = tree
 
-    return toolbar.component
+    return combineToolbars(tabToolbar.component, tree)
   }
 
   /**

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/toolwindow/GitHubAction.kt

@@ -0,0 +1,34 @@
+/*
+ * Designed and developed by 2025 skydoves (Jaewoong Eum)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.skydoves.compose.stability.idea.toolwindow
+
+import com.intellij.icons.AllIcons
+import com.intellij.ide.BrowserUtil
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+
+/**
+ * Action to open the Compose Stability Analyzer GitHub repository.
+ */
+internal class GitHubAction : AnAction(
+  "GitHub",
+  "Open Compose Stability Analyzer on GitHub",
+  AllIcons.Vcs.Vendors.Github,
+) {
+  override fun actionPerformed(e: AnActionEvent) {
+    BrowserUtil.browse("https://github.com/skydoves/compose-stability-analyzer")
+  }
+}

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/toolwindow/SettingsAction.kt

@@ -0,0 +1,36 @@
+/*
+ * Designed and developed by 2025 skydoves (Jaewoong Eum)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.skydoves.compose.stability.idea.toolwindow
+
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.options.ShowSettingsUtil
+
+/**
+ * Action to open the Compose Stability Analyzer settings.
+ */
+internal class SettingsAction : AnAction(
+  "Settings",
+  "Open Compose Stability Analyzer settings",
+  AllIcons.General.Settings,
+) {
+  override fun actionPerformed(e: AnActionEvent) {
+    val project = e.project ?: return
+    ShowSettingsUtil.getInstance()
+      .showSettingsDialog(project, "Compose Stability Analyzer")
+  }
+}

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/toolwindow/StabilityToolWindow.kt

@@ -139,14 +139,11 @@ public class StabilityToolWindow(private val project: Project) {
     actionGroup.add(FilterAllAction())
     actionGroup.add(FilterSkippableAction())
     actionGroup.add(FilterUnskippableAction())
-    actionGroup.addSeparator()
-    actionGroup.add(SettingsAction())
-    actionGroup.add(GitHubAction())
-    val toolbar = ActionManager.getInstance()
+    val tabToolbar = ActionManager.getInstance()
       .createActionToolbar(ActionPlaces.TOOLBAR, actionGroup, true)
-    toolbar.targetComponent = tree
+    tabToolbar.targetComponent = tree
 
-    return toolbar.component
+    return combineToolbars(tabToolbar.component, tree)
   }
 
   private fun refresh() {
@@ -544,32 +541,7 @@ public class StabilityToolWindow(private val project: Project) {
     }
   }
 
-  /**
-   * Settings action
-   */
-  private inner class SettingsAction : AnAction(
-    "Settings",
-    "Open Compose Stability Analyzer settings",
-    AllIcons.General.Settings,
-  ) {
-    override fun actionPerformed(e: AnActionEvent) {
-      com.intellij.openapi.options.ShowSettingsUtil.getInstance()
-        .showSettingsDialog(project, "Compose Stability Analyzer")
-    }
-  }
 
-  /**
-   * GitHub link action
-   */
-  private inner class GitHubAction : AnAction(
-    "GitHub",
-    "Open Compose Stability Analyzer on GitHub",
-    AllIcons.Vcs.Vendors.Github,
-  ) {
-    override fun actionPerformed(e: AnActionEvent) {
-      com.intellij.ide.BrowserUtil.browse("https://github.com/skydoves/compose-stability-analyzer")
-    }
-  }
 
   /**
    * Custom tree cell renderer with color coding

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/toolwindow/StabilityToolWindowFactory.kt

@@ -15,7 +15,6 @@
  */
 package com.skydoves.compose.stability.idea.toolwindow
 
-import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
@@ -61,16 +60,6 @@ public class StabilityToolWindowFactory : ToolWindowFactory {
       false,
     )
     toolWindow.contentManager.addContent(heatmapContent)
-
-    // Add toggle heatmap and clear buttons to tool window title bar
-    val actionManager = ActionManager.getInstance()
-    val titleActions = listOfNotNull(
-      actionManager.getAction("com.skydoves.compose.stability.idea.heatmap.ToggleHeatmapAction"),
-      actionManager.getAction("com.skydoves.compose.stability.idea.heatmap.ClearHeatmapDataAction"),
-    )
-    if (titleActions.isNotEmpty()) {
-      toolWindow.setTitleActions(titleActions)
-    }
   }
 
   public override fun shouldBeAvailable(project: Project): Boolean = true

compose-stability-analyzer-idea/src/main/kotlin/com/skydoves/compose/stability/idea/toolwindow/ToolWindowActions.kt

@@ -0,0 +1,57 @@
+/*
+ * Designed and developed by 2025 skydoves (Jaewoong Eum)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.skydoves.compose.stability.idea.toolwindow
+
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.DefaultActionGroup
+import java.awt.BorderLayout
+import javax.swing.JComponent
+import javax.swing.JPanel
+
+/**
+ * Creates a shared toolbar with right-aligned global actions
+ * (Toggle Heatmap, Clear Recomposition Data, Settings, GitHub).
+ */
+internal fun createSharedToolbar(targetComponent: JComponent): JComponent {
+  val actionGroup = DefaultActionGroup()
+  val actionManager = ActionManager.getInstance()
+  actionManager.getAction("com.skydoves.compose.stability.idea.heatmap.ToggleHeatmapAction")
+    ?.let { actionGroup.add(it) }
+  actionManager.getAction("com.skydoves.compose.stability.idea.heatmap.ClearHeatmapDataAction")
+    ?.let { actionGroup.add(it) }
+  actionGroup.add(SettingsAction())
+  actionGroup.add(GitHubAction())
+
+  val toolbar = actionManager.createActionToolbar(ActionPlaces.TOOLBAR, actionGroup, true)
+  toolbar.targetComponent = targetComponent
+  return toolbar.component
+}
+
+/**
+ * Combines a tab-specific toolbar (left) with the shared global toolbar (right).
+ */
+internal fun combineToolbars(
+  tabToolbar: JComponent,
+  targetComponent: JComponent,
+): JComponent {
+  val sharedToolbar = createSharedToolbar(targetComponent)
+  return JPanel(BorderLayout()).apply {
+    isOpaque = false
+    add(tabToolbar, BorderLayout.WEST)
+    add(sharedToolbar, BorderLayout.EAST)
+  }
+}

compose-stability-analyzer-idea/src/main/resources/META-INF/plugin.xml

@@ -144,5 +144,11 @@
                 description="Clear all accumulated recomposition heatmap data">
             <add-to-group group-id="CodeMenu" anchor="last"/>
         </action>
+
+        <action
+                id="com.skydoves.compose.stability.idea.toolwindow.GitHubAction"
+                class="com.skydoves.compose.stability.idea.toolwindow.GitHubAction"
+                text="GitHub"
+                description="Open Compose Stability Analyzer on GitHub"/>
     </actions>
 </idea-plugin>