Merge pull request #4875 from kuronekochomusuke/doneGUIScale

done and skip buttons handle changes in GUI Scale better
MegaMek · Nov 12, 2023 · 68bcc5f · 68bcc5f
2 parents 7cc4c5c + 18a4df9
commit 68bcc5f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/AbstractPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/AbstractPhaseDisplay.java
@@ -38,7 +38,7 @@ public abstract class AbstractPhaseDisplay extends SkinnedJPanel implements
         BoardViewListener, GameListener, Distractable {
     private static final long serialVersionUID = 4421205210788230341L;
 
-    public static final int DONE_BUTTON_WIDTH = 125;
+    public static final int DONE_BUTTON_WIDTH = 160;
     // Distraction implementation.
     protected DistractableAdapter distracted = new DistractableAdapter();
 

diff --git a/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java
@@ -23,6 +23,7 @@
 import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.MegamekButton;
 import megamek.client.ui.swing.widget.SkinSpecification;
+import megamek.common.Report;
 import megamek.common.annotations.Nullable;
 import megamek.common.preference.PreferenceChangeEvent;
 
@@ -46,7 +47,7 @@ protected ActionPhaseDisplay(ClientGUI cg) {
     protected UIUtil.FixedXPanel setupDonePanel() {
         var donePanel = super.setupDonePanel();
         butSkipTurn = new MegamekButton("SKIP", SkinSpecification.UIComponents.PhaseDisplayDoneButton.getComp());
-        butSkipTurn.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH, MIN_BUTTON_SIZE.height * 1));
+        butSkipTurn.setPreferredSize(new Dimension(UIUtil.scaleForGUI(DONE_BUTTON_WIDTH), MIN_BUTTON_SIZE.height * 1));
         String f = guiScaledFontHTML(UIUtil.uiLightViolet()) +  KeyCommandBind.getDesc(KeyCommandBind.DONE_NO_ACTION)+ "</FONT>";
         butSkipTurn.setToolTipText("<html><body>" + f + "</body></html>");
         addToDonePanel(donePanel, butSkipTurn);
@@ -109,6 +110,7 @@ public void performAction() {
     public void preferenceChange(PreferenceChangeEvent e) {
         super.preferenceChange(e);
         updateDonePanel();
+        adaptToGUIScale();
     }
 
     protected void initDonePanelForNewTurn()
@@ -174,4 +176,8 @@ protected void updateDonePanelButtons(final String doneButtonLabel, final String
             clientgui.getBoardView().turnDetailsOverlay.setLines(turnDetails);
         }
     }
+
+    private void adaptToGUIScale() {
+        butSkipTurn.setPreferredSize(new Dimension(UIUtil.scaleForGUI(DONE_BUTTON_WIDTH), MIN_BUTTON_SIZE.height * 1));
+    }
 }
diff --git a/megamek/src/megamek/client/ui/swing/ChatterBox.java b/megamek/src/megamek/client/ui/swing/ChatterBox.java
@@ -173,7 +173,7 @@ public void focusLost(FocusEvent e) {
         gbc.fill = GridBagConstraints.BOTH;
         gbc.weightx = .13; gbc.weighty = .05;
         chatPanel.add(butDone, gbc);
-        butDone.setSize(AbstractPhaseDisplay.DONE_BUTTON_WIDTH, butDone.getHeight());
+        butDone.setSize(UIUtil.scaleForGUI(AbstractPhaseDisplay.DONE_BUTTON_WIDTH), butDone.getHeight());
         butDone.setPreferredSize(butDone.getSize());
         butDone.setMinimumSize(butDone.getSize());
         chatPanel.setMinimumSize(chatPanel.getPreferredSize());

diff --git a/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java
@@ -26,6 +26,8 @@
 import java.util.stream.Collectors;
 
 import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
 
 import megamek.client.ui.GBC;
 import megamek.client.ui.Messages;
@@ -88,6 +90,8 @@ public int compare(PhaseCommand c1, PhaseCommand c2) {
     protected JPanel panStatus = new JPanel();
     protected JPanel panButtons = new JPanel();
 
+    private UIUtil.FixedXPanel donePanel;
+
     /** The button group that is currently displayed */
     protected int currentButtonGroup = 0;
 
@@ -227,18 +231,18 @@ public void setupButtonPanel() {
 
     protected UIUtil.FixedXPanel setupDonePanel()
     {
-        var donePanel = new UIUtil.FixedXPanel();
-        donePanel.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH+5, MIN_BUTTON_SIZE.height*2+5));
+        donePanel = new UIUtil.FixedXPanel();
+        donePanel.setPreferredSize(new Dimension(UIUtil.scaleForGUI(DONE_BUTTON_WIDTH+5), MIN_BUTTON_SIZE.height*2+5));
         donePanel.setOpaque(false);
         donePanel.setBackground(Color.darkGray);
-        donePanel.setBorder( BorderFactory.createLoweredBevelBorder() );
+        donePanel.setBorder( new EmptyBorder(0, 10, 0, 0));
         donePanel.setLayout(new GridBagLayout());
         addToDonePanel(donePanel, butDone);
         return donePanel;
     }
 
     protected void addToDonePanel(JPanel donePanel, JComponent item) {
-        item.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH, MIN_BUTTON_SIZE.height));
+        item.setPreferredSize(new Dimension(UIUtil.scaleForGUI(DONE_BUTTON_WIDTH), MIN_BUTTON_SIZE.height));
         butDone.setAlignmentX(LEFT_ALIGNMENT);
         donePanel.add(item, GBC.eol().fill(GridBagConstraints.BOTH).weighty(1));
     }
@@ -261,6 +265,8 @@ protected void setStatusBarText(String text) {
     private void adaptToGUIScale() {
         UIUtil.adjustContainer(panButtons, UIUtil.FONT_SCALE1);
         UIUtil.adjustContainer(panStatus, UIUtil.FONT_SCALE2);
+
+        donePanel.setPreferredSize(new Dimension(UIUtil.scaleForGUI(DONE_BUTTON_WIDTH), MIN_BUTTON_SIZE.height * 1));
     }
 
     @Override
@@ -274,6 +280,8 @@ public void preferenceChange(PreferenceChangeEvent e) {
         } else if (e.getName().equals(KeyBindParser.KEYBINDS_CHANGED)) {
             setButtonsTooltips();
         }
+
+        adaptToGUIScale();
     }
 
     @Override
@@ -394,4 +402,5 @@ public void setWeaponFieldOfFire(Entity unit, int[][] ranges, int arc, int loc,
 
         clientgui.getBoardView().setWeaponFieldOfFire(unit, cmd);
     }
+
 }