Skip to content

Commit 15e39a8

Browse files
Fix 'Top usage' and 'Durations' insights layouts #242
1 parent e9dd928 commit 15e39a8

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import org.digma.intellij.plugin.ui.common.*
99
import org.digma.intellij.plugin.ui.list.ListItemActionButton
1010
import org.digma.intellij.plugin.ui.list.PanelsLayoutHelper
1111
import org.digma.intellij.plugin.ui.model.TraceSample
12-
import java.awt.GridLayout
13-
import javax.swing.*
12+
import javax.swing.BoxLayout
13+
import javax.swing.JButton
14+
import javax.swing.JPanel
1415

1516
fun spanDurationPanel(
1617
project: Project,

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ class SpanPanels {
4949

5050
fun percentileRowPanel(percentile: SpanDurationsPercentile, panelsLayoutHelper: PanelsLayoutHelper, traceSamples: ArrayList<TraceSample>): JPanel {
5151

52-
val durationsPanel = createDefaultBoxLayoutLineAxisPanel()
52+
val durationsPanel = JBPanel<JBPanel<*>>()
53+
durationsPanel.layout = BorderLayout(5, 0)
54+
durationsPanel.border = empty()
55+
durationsPanel.isOpaque = false
5356

5457
val percentileName = "P${(percentile.percentile * 100).toInt()}"
5558
traceSamples.add(buildTraceSample(percentile))
@@ -73,7 +76,7 @@ fun percentileRowPanel(percentile: SpanDurationsPercentile, panelsLayoutHelper:
7376
pLabelPanel.isOpaque = false
7477
pLabelPanel.add(pLabel, BorderLayout.WEST)
7578
addCurrentLargestWidthDurationPLabel(panelsLayoutHelper, pLabelPanel.preferredSize.width)
76-
durationsPanel.add(pLabelPanel)
79+
durationsPanel.add(pLabelPanel, BorderLayout.WEST)
7780

7881
if (needToShowDurationChange(percentile)) {
7982
val icon = if (percentile.previousDuration!!.raw > percentile.currentDuration.raw) Laf.Icons.Insight.SPAN_DURATION_DROPPED else Laf.Icons.Insight.SPAN_DURATION_ROSE
@@ -82,7 +85,7 @@ fun percentileRowPanel(percentile: SpanDurationsPercentile, panelsLayoutHelper:
8285
val durationLabelText = asHtml(spanGrayed("$durationText,$whenText"))
8386
val durationLabel = JBLabel(durationLabelText, icon, SwingConstants.LEFT)
8487
durationLabel.toolTipText = durationLabelText
85-
durationsPanel.add(durationLabel)
88+
durationsPanel.add(durationLabel, BorderLayout.CENTER)
8689
}
8790

8891
if (percentile.changeTime != null && (percentile.changeVerified == null || percentile.changeVerified == false)) {
@@ -96,7 +99,7 @@ fun percentileRowPanel(percentile: SpanDurationsPercentile, panelsLayoutHelper:
9699
evalPanel.add(evalLabel, BorderLayout.CENTER)
97100
evalPanel.isOpaque = false
98101
addCurrentLargestWidthIconPanel(panelsLayoutHelper, evalPanel.preferredSize.width)
99-
durationsPanel.add(evalPanel)
102+
durationsPanel.add(evalPanel, BorderLayout.EAST)
100103
}
101104

102105
return durationsPanel

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.digma.intellij.plugin.model.rest.insights.SpanUsagesInsight
88
import org.digma.intellij.plugin.ui.common.*
99
import org.digma.intellij.plugin.ui.model.TraceSample
1010
import java.awt.BorderLayout
11-
import java.awt.GridLayout
11+
import javax.swing.BoxLayout
1212
import javax.swing.JButton
1313
import javax.swing.JLabel
1414
import javax.swing.JPanel
@@ -20,7 +20,7 @@ fun spanUsagesPanel(project: Project, spanUsagesInsight: SpanUsagesInsight): JPa
2020
title.isOpaque = false
2121

2222
val flowsListPanel = JBPanel<JBPanel<*>>()
23-
flowsListPanel.layout = GridLayout(spanUsagesInsight.flows.size, 1, 0, 3)
23+
flowsListPanel.layout = BoxLayout(flowsListPanel, BoxLayout.Y_AXIS)
2424
flowsListPanel.border = JBUI.Borders.empty()
2525
flowsListPanel.isOpaque = false
2626

0 commit comments

Comments
 (0)