Merge pull request #1810 from AaronGullickson/repair-bay-columns

use grid layout for repair tab main panels
MegaMek · Jun 17, 2020 · 4499ea1 · 4499ea1
2 parents 199d1cd + 637e0ed
commit 4499ea1
Showing 1 changed file with 4 additions and 29 deletions.
diff --git a/MekHQ/src/mekhq/gui/RepairTab.java b/MekHQ/src/mekhq/gui/RepairTab.java
@@ -136,7 +136,7 @@ public void initTab() {
                 new EncodeControl());
         GridBagConstraints gridBagConstraints;
 
-        setLayout(new GridBagLayout());
+        setLayout(new GridLayout());
 
         JPanel panServicedUnits = new JPanel(new GridBagLayout());
 
@@ -182,9 +182,7 @@ public void propertyChange(PropertyChangeEvent evt) {
 						txt += String.format(" (%s missing)", PartsAcquisitionService.getMissingCount());
 					}
 				}
-
 				btnAcquisitions.setText(txt);
-
 				btnAcquisitions.repaint();
 			}
 		});
@@ -447,32 +445,9 @@ public void propertyChange(PropertyChangeEvent evt) {
         gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
         panTechs.add(astechPoolLabel, gridBagConstraints);
 
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.weighty = 1.0;
-        add(panServicedUnits, gridBagConstraints);
-
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 1;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.weighty = 1.0;
-        add(panTasks, gridBagConstraints);
-
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 2;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.weightx = 1.0;
-        gridBagConstraints.weighty = 1.0;
-        add(panTechs, gridBagConstraints);
+        add(panServicedUnits);
+        add(panTasks);
+        add(panTechs);
 
         filterTechs();
     }