Revalidate envs panel (#103)

* revalidate envs panel

Signed-off-by: shalom <[email protected]>

* revalidate envs panel

Signed-off-by: shalom <[email protected]>

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/AbstractViewService.kt

@@ -71,7 +71,6 @@ abstract class AbstractViewService(val project: Project) {
                     toolWindowContent?.displayName = getViewDisplayName()
                     toolWindowContent?.component?.revalidate()
                     toolWindow?.component?.revalidate()
-                    toolWindow?.component?.repaint()
                 }
             }
 

src/main/java/org/digma/intellij/plugin/toolwindow/DigmaToolWindowFactory.java

@@ -4,6 +4,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
+import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.service.EditorInteractionService;
@@ -40,6 +41,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         var toolWindowTabsHelper = project.getService(ToolWindowTabsHelper.class);
         toolWindowTabsHelper.setToolWindow(toolWindow);
 
+        Content contentToSelect;
+
         {
             var insightsPanel = InsightsTabKt.insightsPanel(project);
             var insightsViewService = project.getService(InsightsViewService.class);
@@ -51,6 +54,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
             toolWindow.getContentManager().addContent(insightsContent);
             insightsViewService.setContent(toolWindow,insightsContent);
             toolWindowTabsHelper.setInsightsContent(insightsContent);
+            contentToSelect = insightsContent;
         }
 
         {
@@ -73,5 +77,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
 
         project.getService(ToolWindowShower.class).setToolWindow(toolWindow);
         EditorInteractionService.getInstance(project).start();
+
+        toolWindow.getContentManager().setSelectedContent(contentToSelect, true);
     }
 }

src/main/kotlin/org/digma/intellij/plugin/ui/common/EnvironmentsPanel.kt

@@ -11,24 +11,17 @@ import org.digma.intellij.plugin.analytics.EnvironmentChanged
 import org.digma.intellij.plugin.common.CommonUtils
 import org.digma.intellij.plugin.ui.model.environment.EnvironmentsListChangedListener
 import org.digma.intellij.plugin.ui.model.environment.EnvironmentsSupplier
-import java.awt.BorderLayout
+import java.awt.Dimension
 import java.awt.FlowLayout
 import java.awt.GridLayout
 import java.util.*
 import java.util.function.Function
 import javax.swing.JPanel
+import kotlin.math.min
 
 fun environmentsPanel(project: Project, environmentsSupplier: EnvironmentsSupplier): JPanel {
 
-    val envsPanel = EnvironmentsPanel(project, environmentsSupplier)
-
-    val result = JPanel()
-    result.isOpaque = false
-    result.border = JBUI.Borders.empty()
-    result.layout = BorderLayout()
-    result.add(envsPanel, BorderLayout.CENTER)
-    return result
-
+    return EnvironmentsPanel(project, environmentsSupplier)
 }
 
 
@@ -56,6 +49,29 @@ class EnvironmentsPanel(project: Project, private val environmentsSupplier: Envi
         Disposer.register(project, messageBusConnection)
     }
 
+
+    /*
+    usually this panel works fine.
+    there is one issue: sometimes when the plugin window opens on startup this panel takes too much
+    vertical space and the insights list is almost not shown. any hover over this panel with the mouse or any
+    other action related to the plugin will fix it and the tab will re-layout. from there on the panel functions ok.
+    I could not find any way to cause this panel to layout correctly on startup.
+    so the code in getPreferredSize limits the height on startup to a reasonable size and only the first few calls
+    to getPreferredSize, from there on its ok. it proves to solve or at least hide the issue.
+    it will be noticeable when there are many environments and only on first opening of the window and only occasionally.
+     */
+    private var startup = 0
+    override fun getPreferredSize(): Dimension {
+        if (startup < 5) {
+            startup++
+            val d = super.getPreferredSize()
+            if (d != null) {
+                return Dimension(d.width, min(d.height, 300))
+            }
+        }
+        return super.getPreferredSize()
+    }
+
     private fun select(newSelectedEnv: String?) {
         val currentSelected: EnvLink? = getSelected()
         if (currentSelected != null) {
@@ -166,6 +182,17 @@ class EnvironmentsPanel(project: Project, private val environmentsSupplier: Envi
         val localHostname = CommonUtils.getLocalHostname()
         return environment.startsWith(localHostname, true)
     }
+
+
+    //this is the method called by the platform when requesting focus with ContentManager.setSelectedContent
+    override fun requestFocus() {
+        getSelected()?.requestFocusInWindow()
+    }
+
+    override fun requestFocusInWindow(): Boolean {
+        requestFocus()
+        return true
+    }
 }
 
 

src/main/kotlin/org/digma/intellij/plugin/ui/common/Panels.kt

@@ -60,6 +60,14 @@ fun createTopPanel(project: Project, model: PanelModel): DigmaResettablePanel {
         override fun reset() {
             scopeLine.reset()
         }
+
+        override fun requestFocus() {
+            envsPanel.requestFocus()
+        }
+
+        override fun requestFocusInWindow(): Boolean {
+            return envsPanel.requestFocusInWindow()
+        }
     }
 
     result.isOpaque = false

src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorDetailsPanel.kt

@@ -397,7 +397,7 @@ fun getAffectedServicesTooltip(errorsModel: ErrorsModel): String {
 }
 
 
-private fun backButton(project: Project): JComponent {
+private fun backButton(project: Project): JPanel {
 
     val size = Laf.scalePanels(Laf.Sizes.ERROR_DETAILS_BACK_BUTTON_SIZE)
     val buttonsSize = Dimension(size + 2, size + 3)

src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorsTab.kt

@@ -112,7 +112,7 @@ fun errorsPanel(project: Project): DigmaTabPanel {
         }
 
         override fun getPreferredFocusedComponent(): JComponent {
-            return errorsList
+            return topPanelWrapper
         }
 
         //reset must be called from EDT
@@ -139,9 +139,8 @@ fun errorsPanel(project: Project): DigmaTabPanel {
                 errorsPanelListCardLayout.show(errorsPanelListCardPanel, LIST_CARD_NAME)
             }
 
-            errorsPanelListCardPanel.revalidate()
-            cardsPanel.revalidate()
             revalidate()
+            repaint()
         }
     }
 

src/main/kotlin/org/digma/intellij/plugin/ui/insights/InsightsTab.kt

@@ -84,11 +84,7 @@ fun insightsPanel(project: Project ): DigmaTabPanel {
         }
 
         override fun getPreferredFocusedComponent(): JComponent {
-            return if (insightsModel.card.name == InsightsTabCard.INSIGHTS.name){
-                insightsList
-            }else{
-                previewList
-            }
+            return topPanelWrapper
         }
 
         //reset must be called from EDT
@@ -109,8 +105,8 @@ fun insightsPanel(project: Project ): DigmaTabPanel {
                 cardLayout.show(cardsPanel, insightsModel.card.name)
             }
 
-            cardsPanel.revalidate()
             revalidate()
+            repaint()
         }
     }
 

src/main/kotlin/org/digma/intellij/plugin/ui/list/PanelList.kt

@@ -99,8 +99,8 @@ abstract class PanelList(val project: Project, private var model: PanelListModel
 
         for (i in 0 until model.getSize()) run {
             cellRenderer.apply {
-                val newComp: JPanel = getListCellRendererComponent(project,this@PanelList,
-                    model.getElementAt(i), i, this@PanelList.hasFocus(),panelsLayoutHelper)
+                val newComp: JPanel = getListCellRendererComponent(project, this@PanelList,
+                        model.getElementAt(i), i, this@PanelList.hasFocus(), panelsLayoutHelper)
                 add(newComp)
                 if (gapBetweenItems) {
                     add(Box.createVerticalStrut(scaleBorders(5)))
@@ -109,7 +109,8 @@ abstract class PanelList(val project: Project, private var model: PanelListModel
 
         }
 
-        this.revalidate()
+        revalidate()
+        repaint()
     }