Merge pull request #5105 from WeaverThree/wvr-resolve-scenario-a

ResolveScenarioWizardDialog - Some UX Improvements
MegaMek · Oct 23, 2024 · 7776cc2 · 7776cc2
2 parents e74dbf9 + 06316b4
commit 7776cc2
Showing 1 changed file with 7 additions and 38 deletions.
diff --git a/MekHQ/src/mekhq/gui/dialog/ResolveScenarioWizardDialog.java b/MekHQ/src/mekhq/gui/dialog/ResolveScenarioWizardDialog.java
@@ -26,6 +26,7 @@
 import megamek.client.ui.preferences.JWindowPreference;
 import megamek.client.ui.preferences.PreferencesNode;
 import megamek.client.ui.swing.UnitEditorDialog;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.GunEmplacement;
 import megamek.common.options.OptionsConstants;
 import megamek.logging.MMLogger;
@@ -243,8 +244,6 @@ private void initComponents() {
         txtInstructions.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createTitledBorder(resourceMap.getString("txtInstructions.title")),
                 BorderFactory.createEmptyBorder(5,5,5,5)));
-        txtInstructions.setMinimumSize(new Dimension(590,120));
-        txtInstructions.setPreferredSize(new Dimension(590,120));
         getContentPane().add(txtInstructions, BorderLayout.PAGE_START);
 
         /*
@@ -856,8 +855,8 @@ private void initComponents() {
         pnlPreview.add(new JScrollPaneWithSpeed(txtRewards), gridBagConstraints);
 
         txtReport.setText("");
-        txtReport.setPreferredSize(new Dimension(500, 300));
-        txtReport.setMinimumSize(new Dimension(500, 300));
+        txtReport.setPreferredSize(UIUtil.scaleForGUI(500, 300));
+        txtReport.setMinimumSize(UIUtil.scaleForGUI(500, 300));
         gridBagConstraints = new GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 2;
@@ -992,8 +991,8 @@ private void initComponents() {
 
 
         scrMain = new JScrollPaneWithSpeed(pnlMain);
-        scrMain.setMinimumSize(new Dimension(600, 500));
-        scrMain.setPreferredSize(new Dimension(600, 500));
+        scrMain.setMinimumSize(UIUtil.scaleForGUI(600, 500));
+        scrMain.setPreferredSize(UIUtil.scaleForGUI(900, 500));
         getContentPane().add(scrMain, BorderLayout.CENTER);
 
 
@@ -1169,34 +1168,6 @@ private void switchPanel(String name) {
         cardLayout.show(pnlMain, currentPanel);
         switchInstructions();
 
-        switch (name) {
-            case PILOTPANEL:
-                pnlMain.setPreferredSize(pnlPilotStatus.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case UNITSPANEL:
-                pnlMain.setPreferredSize(pnlUnitStatus.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case SALVAGEPANEL:
-                pnlMain.setPreferredSize(pnlSalvage.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case KILLPANEL:
-                pnlMain.setPreferredSize(pnlKills.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case REWARDPANEL:
-                pnlMain.setPreferredSize(pnlRewards.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case PREVIEWPANEL:
-                pnlMain.setPreferredSize(pnlPreview.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case OBJECTIVEPANEL:
-                pnlMain.setPreferredSize(pnlObjectiveStatus.getLayout().preferredLayoutSize(pnlMain));
-                break;
-            case PRISONERPANEL:
-                pnlMain.setPreferredSize(pnlPrisonerStatus.getLayout().preferredLayoutSize(pnlMain));
-                break;
-        }
-
-
         SwingUtilities.invokeLater(() -> scrMain.getVerticalScrollBar().setValue(0));
         pack();
     }
@@ -1237,8 +1208,6 @@ private void switchInstructions() {
         txtInstructions.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createTitledBorder(resourceMap.getString("txtInstructions.title")),
                 BorderFactory.createEmptyBorder(5, 5, 5, 5)));
-        txtInstructions.setMinimumSize(new Dimension(590, 150));
-        txtInstructions.setPreferredSize(new Dimension(590, 150));
         getContentPane().add(txtInstructions, BorderLayout.PAGE_START);
     }
 
@@ -1769,8 +1738,8 @@ private void showPerson(PersonStatus status, boolean isPrisoner) {
         gridBagConstraints.fill = GridBagConstraints.NONE;
         dialog.getContentPane().add(btn, gridBagConstraints);
 
-        dialog.setMinimumSize(new Dimension(600, 300));
-        dialog.setPreferredSize(new Dimension(600, 300));
+        dialog.setMinimumSize(UIUtil.scaleForGUI(450, 700));
+        dialog.setPreferredSize(UIUtil.scaleForGUI(450, 700));
         dialog.validate();
         dialog.setLocationRelativeTo(frame);
         dialog.setVisible(true);