diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
index 4091335f22c..f0376343979 100644
--- 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
index 27cee822d6f..656ddb0d5e3 100644
--- 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("" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient().getBoard(), clientGUI) + "",
- SwingConstants.LEFT);
+ String div = "" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient().getBoard(), clientGUI) + "
";
+ JLabel labTarget = new JLabel("" + div + "", 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
index 1a8a2ed0065..0730ed32376 100644
--- 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 {
+ 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("" + UnitToolTip.getEntityTipVitals(target, null) + "");
+ String div = "" + UnitToolTip.getEntityTipVitals(target, null) + "
";
+ button.setText("" + div + "");
}
@Override
diff --git a/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java b/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java
index 4b54ee7ca40..c3968e3cb7e 100644
--- 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 {
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("" + infoText(target) + UnitToolTip.getTargetTipDetail(target,
- clientGUI.getClient().getBoard(), clientGUI) + "");
+ String div = "" + infoText(target) + UnitToolTip.getTargetTipDetail(target,
+ clientGUI.getClient().getBoard(), clientGUI) + "
";
+ button.setText("" + div + "");
}
@Override
diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java
index 087f389a18d..9bbf444538f 100644
--- 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;