Merge pull request #4468 from kuronekochomusuke/unitToolTipMaxWidth

limit the width of the unit tooltip so that it does not grow really wide
MegaMek · Jun 4, 2023 · 0cdfc4e · 0cdfc4e
2 parents e46d9ce + b4a0fb9
commit 0cdfc4e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
@@ -1278,6 +1278,8 @@ CommonSettingsDialog.translucentHiddenUnits=Make unseen units translucent
 CommonSettingsDialog.uiTheme=UI Theme:
 CommonSettingsDialog.unitDisplay=Unit Tooltip / Unit Display
 CommonSettingsDialog.unitDisplayHeatToolTip=Max heat value for each level
+CommonSettingsDialog.unitTooltipMaxWidth=Max Width for Unit Tooltip
+CommonSettingsDialog.unitTooltipMaxWidth.tooltip=keeps tool tip from growing too wide
 CommonSettingsDialog.useAverageSkills=Use the current random skill settings when adding units in the lobby.
 CommonSettingsDialog.useCamoOverlay=Use Camo Overlay
 CommonSettingsDialog.useInclines=Show incline highlighting and shadows at hex borders

diff --git a/megamek/src/megamek/client/ui/swing/AimedShotDialog.java b/megamek/src/megamek/client/ui/swing/AimedShotDialog.java
@@ -29,6 +29,7 @@
 
 import megamek.client.ui.Messages;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.IndexedRadioButton;
 import megamek.common.Targetable;
 import megamek.common.annotations.Nullable;
@@ -44,6 +45,8 @@ public class AimedShotDialog extends JDialog {
     private IndexedRadioButton[] checkboxes;
     private boolean[] boxEnabled;
 
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
+
     public AimedShotDialog(JFrame parent, String title, String message,
                            String[] choices, boolean[] enabled, int selectedIndex,
                            ClientGUI clientGUI, Targetable target,
@@ -66,8 +69,8 @@ public AimedShotDialog(JFrame parent, String title, String message,
         gridbag.setConstraints(labMessage, c);
         getContentPane().add(labMessage);
 
-        JLabel labTarget = new JLabel("<html>" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient().getBoard(), clientGUI) + "</hmtl>",
-                SwingConstants.LEFT);
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient().getBoard(), clientGUI) + "</DIV>";
+        JLabel labTarget = new JLabel("<html>" + div + "</hmtl>", SwingConstants.LEFT);
         c.weightx = 1.0;
         c.weighty = 1.0;
         c.gridwidth = 0;

diff --git a/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java b/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java
@@ -15,6 +15,7 @@
 
 import megamek.client.ui.enums.DialogResult;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.Entity;
 import megamek.common.annotations.Nullable;
 
@@ -26,6 +27,7 @@
  * in brief or in detail.
  */
 public class EntityChoiceDialog extends AbstractChoiceDialog<Entity> {
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
 
     /**
      * This creates a modal dialog to pick one or more entities.
@@ -45,7 +47,8 @@ protected EntityChoiceDialog(JFrame frame, String title, String message,
 
     @Override
     protected void detailLabel(JToggleButton button, Entity target) {
-        button.setText("<html>" + UnitToolTip.getEntityTipVitals(target, null) + "</html>");
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" + UnitToolTip.getEntityTipVitals(target, null) + "</DIV>";
+        button.setText("<html>" + div + "</html>");
     }
 
     @Override

diff --git a/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java b/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java
@@ -14,8 +14,8 @@
 package megamek.client.ui.swing;
 
 import megamek.client.ui.enums.DialogResult;
-import megamek.client.ui.swing.tooltip.HexTooltip;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.*;
 import megamek.common.actions.WeaponAttackAction;
 import megamek.common.annotations.Nullable;
@@ -31,6 +31,8 @@ public class TargetChoiceDialog extends AbstractChoiceDialog<Targetable> {
     final ClientGUI clientGUI;
     Entity firingEntity;
 
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
+
      /**
      * This creates a modal dialog to pick one or more Targetable objects.
      * @param frame         parent @JFrame that owns this dialog
@@ -73,8 +75,9 @@ protected TargetChoiceDialog(JFrame frame, String title, String message,
 
     @Override
     protected void detailLabel(JToggleButton button, Targetable target) {
-        button.setText("<html>" + infoText(target) + UnitToolTip.getTargetTipDetail(target,
-                clientGUI.getClient().getBoard(), clientGUI) + "</html>");
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" +  infoText(target) + UnitToolTip.getTargetTipDetail(target,
+                clientGUI.getClient().getBoard(), clientGUI) + "</DIV>";
+        button.setText("<html>" + div + "</html>");
     }
 
     @Override

diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java
@@ -23,7 +23,6 @@
 import megamek.client.ui.swing.boardview.BoardView;
 import megamek.client.ui.swing.tooltip.PilotToolTip;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
-import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.*;
 import megamek.common.*;
 import megamek.common.util.fileUtils.MegaMekFile;