X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;fp=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=b6f85b3d11173c3394b28c20d717900aebdf9fcd;hb=b3206ecee2cb2787e7481c7aefc73f06fc3798c1;hp=e4cbf6124dfce361f0519bc601ed42571b773ee4;hpb=fd1c6fd67abdd50ff0d77410d3da9be66be315ce;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index e4cbf61..b6f85b3 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -20,8 +20,6 @@
*/
package jalview.gui;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
@@ -39,6 +37,8 @@ import javax.swing.JPanel;
import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
+import jalview.util.MessageManager;
+
/**
* useful functions for building Swing GUIs
*
@@ -60,15 +60,34 @@ public final class JvSwingUtils
public static String wrapTooltip(boolean enclose, String ttext)
{
ttext = ttext.trim();
- if (ttext.length() < 60)
+ boolean maxLenghtExceeded = false;
+
+ if (ttext.contains("
"))
+ {
+ String[] htmllines = ttext.split("
");
+ for (String line : htmllines)
+ {
+ maxLenghtExceeded = line.length() > 60;
+ if (maxLenghtExceeded)
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ maxLenghtExceeded = ttext.length() > 60;
+ }
+
+ if (!maxLenghtExceeded)
{
return enclose ? "" + ttext + "" : ttext;
}
else
{
- return (enclose ? "" : "")
- + "
" + ((enclose ? "" : ""));
+ return (enclose ? ""
+ : "")
+ + ttext + ((enclose ? " |
" : ""));
}
}