Refactored UI components to use scaleForGUI for size adjustments

This change updated various UI components in different tabs to use the `UIUtil.scaleForGUI` method for setting their sizes. The adjustment ensures that the components scale appropriately, improving the application's compatibility with different display settings and resolutions.

MekHQ/src/mekhq/gui/panes/campaignOptions/tabs/CampaignOptionsUtilities.java

@@ -52,8 +52,8 @@ static JCheckBox createCheckBox(String name, @Nullable Integer customWrapSize) {
  checkBox.setName("chk" + name);
 
  Dimension size = checkBox.getPreferredSize();
- checkBox.setMaximumSize(size);
- checkBox.setMinimumSize(size);
+ checkBox.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
+ checkBox.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
 
  return checkBox;
  }
@@ -104,8 +104,8 @@ static JSpinner createSpinner(String name, @Nullable Integer customWrapSize, dou
  editor.getTextField().setHorizontalAlignment(JTextField.LEFT);
 
  Dimension size = jSpinner.getPreferredSize();
- jSpinner.setMaximumSize(size);
- jSpinner.setMinimumSize(size);
+ jSpinner.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
+ jSpinner.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
 
  return jSpinner;
  }
@@ -147,8 +147,8 @@ static JLabel createLabel(String name, @Nullable Integer customWrapSize) {
  jLabel.setName("lbl" + name);
 
  Dimension size = jLabel.getPreferredSize();
- jLabel.setMinimumSize(size);
- jLabel.setMaximumSize(size);
+ jLabel.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
+ jLabel.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
 
  return jLabel;
  }
@@ -188,8 +188,8 @@ static JTextField createTextField(String name, @Nullable Integer customWrapSize,
  jTextField.setName("txt" + name);
 
  int preferredHeight = jTextField.getPreferredSize().height;
- jTextField.setMinimumSize(new Dimension(UIUtil.scaleForGUI(width), preferredHeight));
- jTextField.setMaximumSize(new Dimension(UIUtil.scaleForGUI(width), preferredHeight));
+ jTextField.setMinimumSize(UIUtil.scaleForGUI(width, preferredHeight));
+ jTextField.setMaximumSize(UIUtil.scaleForGUI(width, preferredHeight));
 
  return jTextField;
  }
@@ -265,7 +265,7 @@ static JPanel createStandardPanel(String name, boolean includeBorder, String bor
  sizeWidth = UIUtil.scaleForGUI(750);
  }
 
- panel.setMaximumSize(new Dimension(sizeWidth, sizeHeight));
+ panel.setMaximumSize(UIUtil.scaleForGUI(sizeWidth, sizeHeight));
 
  return panel;
  }
@@ -298,12 +298,12 @@ static JPanel createHeaderPanel(String name, String imageAddress, boolean includ
  resources.getString("lbl" + name + "Body.text")), SwingConstants.CENTER);
  lblBody.setName("lbl" + name + "Body");
  Dimension size = lblBody.getPreferredSize();
- lblBody.setMaximumSize(new Dimension(UIUtil.scaleForGUI(750), size.height));
+ lblBody.setMaximumSize(UIUtil.scaleForGUI(750, size.height));
  }
 
  final JPanel panel = createStandardPanel("pnl" + name + "HeaderPanel", false, "");
  Dimension size = panel.getPreferredSize();
- panel.setPreferredSize(new Dimension(UIUtil.scaleForGUI(750), size.height));
+ panel.setPreferredSize(UIUtil.scaleForGUI(750, size.height));
 
  final GroupLayout layout = createStandardLayout(panel);
  panel.setLayout(layout);
@@ -366,8 +366,8 @@ static JPanel createParentPanel(JPanel panel, String name) {
  }
 
  Dimension size = new Dimension(widthNew, height);
- parentPanel.setMinimumSize(size);
- parentPanel.setMaximumSize(size);
+ parentPanel.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
+ parentPanel.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
 
  // Layout
  parentPanel.setLayout(parentLayout);
@@ -473,8 +473,8 @@ static JButton createButton(String name) {
  jButton.setName("btn" + name);
 
  Dimension size = jButton.getPreferredSize();
- jButton.setMinimumSize(size);
- jButton.setMaximumSize(size);
+ jButton.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
+ jButton.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
 
  return jButton;
  }

MekHQ/src/mekhq/gui/panes/campaignOptions/tabs/EquipmentAndSuppliesTab.java

@@ -1,6 +1,7 @@
 package mekhq.gui.panes.campaignOptions.tabs;
 
 import megamek.client.ui.baseComponents.MMComboBox;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.EquipmentType;
 import mekhq.MekHQ;
 import mekhq.campaign.campaignOptions.CampaignOptions;
@@ -650,8 +651,8 @@ private JPanel createOutputModifiersPanel() {
  */
  private void setSpinnerWidth(JSpinner spinner) {
  Dimension size = spinner.getPreferredSize();
- spinner.setMaximumSize(size);
- spinner.setMinimumSize(size);
+ spinner.setMaximumSize(UIUtil.scaleForGUI(size.width, size.height));
+ spinner.setMinimumSize(UIUtil.scaleForGUI(size.width, size.height));
  }
 
  /**

MekHQ/src/mekhq/gui/panes/campaignOptions/tabs/GeneralTab.java

@@ -112,20 +112,20 @@ public AbstractMHQScrollablePanel createGeneralTab() {
  // Camouflage
  lblCamo = createLabel("Camo");
  btnCamo.setName("btnCamo");
- btnCamo.setMinimumSize(new Dimension(100, 100));
- btnCamo.setMaximumSize(new Dimension(100, 100));
+ btnCamo.setMinimumSize(UIUtil.scaleForGUI(100, 100));
+ btnCamo.setMaximumSize(UIUtil.scaleForGUI(100, 100));
  btnCamo.addActionListener(this::btnCamoActionPerformed);
 
  // Unit icon
  lblIcon = createLabel("Icon");
  btnIcon.setName("btnIcon");
- btnIcon.setMinimumSize(new Dimension(100,  100));
- btnIcon.setMaximumSize(new Dimension(100, 100));
+ btnIcon.setMinimumSize(UIUtil.scaleForGUI(100, 100));
+ btnIcon.setMaximumSize(UIUtil.scaleForGUI(100, 100));
  btnIcon.addActionListener(evt -> {
  final UnitIconDialog unitIconDialog = new UnitIconDialog(frame, unitIcon);
  if (unitIconDialog.showDialog().isConfirmed() && (unitIconDialog.getSelectedItem() != null)) {
  unitIcon = unitIconDialog.getSelectedItem();
- btnIcon.setIcon(unitIcon.getImageIcon(75));
+ btnIcon.setIcon(unitIcon.getImageIcon(UIUtil.scaleForGUI(75)));
  }
  });
 
@@ -217,7 +217,7 @@ private static JPanel createGeneralHeader() {
  resources.getString("lblGeneralBody.text")), SwingConstants.CENTER);
  lblBody.setName("lblGeneralHeaderBody");
  Dimension size = lblBody.getPreferredSize();
- lblBody.setMaximumSize(new Dimension(UIUtil.scaleForGUI(750), size.height));
+ lblBody.setMaximumSize(UIUtil.scaleForGUI(750, size.height));
 
  final JPanel panel = createStandardPanel("pnlGeneralHeaderPanel", false);
  final GroupLayout layout = createStandardLayout(panel);

MekHQ/src/mekhq/gui/panes/campaignOptions/tabs/PersonnelTab.java

@@ -1,6 +1,7 @@
 package mekhq.gui.panes.campaignOptions.tabs;
 
 import megamek.client.ui.baseComponents.MMComboBox;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.enums.SkillLevel;
 import mekhq.campaign.personnel.Skills;
 import mekhq.campaign.personnel.enums.*;
@@ -1173,8 +1174,8 @@ private JPanel createBaseSalariesPanel() {
  jLabel.setName("lbl" + componentName);
 
  Dimension labelSize = jLabel.getPreferredSize();
- jLabel.setMinimumSize(labelSize);
- jLabel.setMaximumSize(labelSize);
+ jLabel.setMinimumSize(UIUtil.scaleForGUI(labelSize.width, labelSize.height));
+ jLabel.setMaximumSize(UIUtil.scaleForGUI(labelSize.width, labelSize.height));
 
  // JSpinner
  JSpinner jSpinner = new JSpinner();
@@ -1185,8 +1186,8 @@ private JPanel createBaseSalariesPanel() {
  editor.getTextField().setHorizontalAlignment(JTextField.LEFT);
 
  Dimension spinnerSize = jSpinner.getPreferredSize();
- jSpinner.setMaximumSize(spinnerSize);
- jSpinner.setMinimumSize(spinnerSize);
+ jSpinner.setMaximumSize(UIUtil.scaleForGUI(spinnerSize.width, spinnerSize.height));
+ jSpinner.setMinimumSize(UIUtil.scaleForGUI(spinnerSize.width, spinnerSize.height));
 
  // Component Tracking Assignment
  lblBaseSalary[personnelRole.ordinal()] = jLabel;