JAL-3210 Merge branch 'develop' into trialMerge

[jalview.git] / src / jalview / gui / JvSwingUtils.java
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java

index 4658668..41287d2 100644 (file)
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -96,8 +96,19 @@ public final class JvSwingUtils
      }
  
      return (enclose ? "<html>" : "")
-            + "<style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
-            + ttext + "</p>" + ((enclose ? "</html>" : ""));
+            
+     // BH 2018
+            
+            + "<style> div.ttip {width:350px;white-space:pre-wrap;padding:2px;overflow-wrap:break-word;}</style><div class=\"ttip\">"
+            
+//            + "<style> p.ttip {width:350px;margin:-14px 0px -14px 0px;padding:2px;overflow-wrap:break-word;}"
+//            + "</style><p class=\"ttip\">"
+                        
+            + ttext
+            
+            + " </div>"
+//            + "</p>"
+            + ((enclose ? "</html>" : ""));
  
    }
  
@@ -319,13 +330,13 @@ public final class JvSwingUtils
     * @param entries
     * @param tooltips
     */
-  public static JComboBox<String> buildComboWithTooltips(
-          List<String> entries, List<String> tooltips)
+  public static JComboBox<Object> buildComboWithTooltips(
+          List<Object> entries, List<String> tooltips)
    {
-    JComboBox<String> combo = new JComboBox<>();
+    JComboBox<Object> combo = new JComboBox<>();
      final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer();
      combo.setRenderer(renderer);
-    for (String attName : entries)
+    for (Object attName : entries)
      {
        combo.addItem(attName);
      }