git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'features/JAL-4034_improve_3dbeacons_button_and_ux' into develop
[jalview.git] / src / jalview / gui / JvSwingUtils.java
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 8ec40cb..e7f992d 100644 (file)
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -20,9 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.io.IntKeyStringValueEntry;
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -49,6 +46,8 @@ import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 
+import jalview.util.MessageManager;
+
 /**
  * useful functions for building Swing GUIs
  * 
@@ -97,9 +96,14 @@ 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>" : ""));
   }
 
   public static JButton makeButton(String label, String tooltip,
@@ -320,55 +324,13 @@ public final class JvSwingUtils
    * @param entries
    * @param tooltips
    */
-  public static JComboBox<String> buildComboWithTooltips(
-          List<String> entries, List<String> tooltips)
-  {
-    JComboBox<String> combo = new JComboBox<>();
-    final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer();
-    combo.setRenderer(renderer);
-    for (String attName : entries)
-    {
-      combo.addItem(attName);
-    }
-    renderer.setTooltips(tooltips);
-    final MouseAdapter mouseListener = new MouseAdapter()
-    {
-      @Override
-      public void mouseEntered(MouseEvent e)
-      {
-        int j = combo.getSelectedIndex();
-        if (j > -1)
-        {
-          combo.setToolTipText(tooltips.get(j));
-        }
-      }
-      @Override
-      public void mouseExited(MouseEvent e)
-      {
-        combo.setToolTipText(null);
-      }
-    };
-    for (Component c : combo.getComponents())
-    {
-      c.addMouseListener(mouseListener);
-    }
-    return combo;
-  }
-
-  /**
-   * A helper method to build a drop-down choice of values, with tooltips for the
-   * entries
-   * 
-   * @param entries
-   * @param tooltips
-   */
-  public static JComboBox<IntKeyStringValueEntry> buildIntKeyStringValueComboWithTooltips(
-          List<IntKeyStringValueEntry> entries, List<String> tooltips)
+  public static JComboBox<Object> buildComboWithTooltips(
+          List<Object> entries, List<String> tooltips)
   {
-    JComboBox<IntKeyStringValueEntry> combo = new JComboBox<>();
+    JComboBox<Object> combo = new JComboBox<>();
     final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer();
     combo.setRenderer(renderer);
-    for (IntKeyStringValueEntry attName : entries)
+    for (Object attName : entries)
     {
       combo.addItem(attName);
     }