Merge branch 'data-panel-ui-filling' into develop

chewiebug · Jan 10, 2021 · b6a75a7 · b6a75a7
2 parents 399d713 + cea47f6
commit b6a75a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/GCDocument.java b/src/main/java/com/tagtraum/perf/gcviewer/view/GCDocument.java
@@ -192,7 +192,7 @@ public void relayout() {
             constraints.gridx = 1;
             constraints.weightx = 0;
             constraints.weighty = 0;
-            constraints.fill = GridBagConstraints.HORIZONTAL;
+            constraints.fill = GridBagConstraints.BOTH;
             constraints.anchor = GridBagConstraints.SOUTH;
             getContentPane().add(modelMetricsPanel, constraints);
             modelMetricsPanel.setVisible(showModelMetricsPanel && (!chartPanelView.isMinimized()));

diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanel.java b/src/main/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanel.java
@@ -179,7 +179,13 @@ public void addEntry(String name) {
 
             labelMap.put(name, new TwoLabelsContainer(nameLabel, valueLabel));
     	}
-
+
+    	public void fixGroupsHeight() {
+    	    for (Component component : getComponents()) {
+    	        component.setMaximumSize(new Dimension(component.getMaximumSize().width, component.getPreferredSize().height));
+            }
+        }
+
     	public void removeEntry(String name) {
     	    TwoLabelsContainer labelContainer = labelMap.get(name);
     	    assert labelContainer != null : "labelContainer for '" + name + "' is null -> was it registered?";
@@ -233,8 +239,10 @@ public MemoryTab() {
 
             addEntry(LocalisationHelper.getString("data_panel_memory_promotion_avg"));
             addEntry(LocalisationHelper.getString("data_panel_memory_promotion_total"));
-       }
-
+
+            fixGroupsHeight();
+        }
+
         public void setModel(GCModel model) {
             boolean fullGcDataAvailable = model.getFootprintAfterFullGC().getN() != 0;
             boolean fullGcSlopeDataAvailable = model.getFootprintAfterFullGC().getN() > 1;
@@ -377,8 +385,10 @@ public PauseTab() {
             addEntry(LocalisationHelper.getString("data_panel_count_gc_pauses"));
             addEntry(LocalisationHelper.getString("data_panel_avg_gcpause"));
             addEntry(LocalisationHelper.getString("data_panel_min_max_gc_pause"));
+
+            fixGroupsHeight();
         }
-        
+
         public void setModel(GCModel model) {
             boolean pauseDataAvailable = model.getPause().getN() > 0;
             boolean gcDataAvailable = model.getGCPause().getN() > 0;
@@ -469,8 +479,10 @@ public SummaryTab() {
             addEntry(LocalisationHelper.getString("data_panel_performance_fullgc"));
             addEntry(LocalisationHelper.getString("data_panel_count_gc_pauses"));
             addEntry(LocalisationHelper.getString("data_panel_performance_gc"));
+
+            fixGroupsHeight();
         }
-        
+
         public void setModel(GCModel model) {
             boolean fullGcDataAvailable = model.getFootprintAfterFullGC().getN() > 0;
             boolean postConcurrentUsedSizeAvailable = model.getPostConcurrentCycleHeapUsedSizes().getN() > 0;