X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=0a765cbb27c21e46eaec86e611420d80b204042e;hb=75a43bd6a9f7a85dfbc04246540f27505622ca97;hp=65be457b655df42e62af87a5b3272b5835ca010b;hpb=91ef57a97eda85f9bb7b6f68bba52e06f19c29b8;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index 65be457..0a765cb 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -60,15 +60,11 @@ public final class JvSwingUtils */ public static String wrapTooltip(boolean enclose, String ttext) { - Objects.requireNonNull(ttext, "Tootip text to format must not be null!"); + Objects.requireNonNull(ttext, + "Tootip text to format must not be null!"); ttext = ttext.trim(); boolean maxLengthExceeded = false; - /* - * Split into lines if already separated by
tags. - * - * TODO what about
,
,
? - */ if (ttext.contains("
")) { String[] htmllines = ttext.split("
"); @@ -91,9 +87,10 @@ public final class JvSwingUtils return enclose ? "" + ttext + "" : ttext; } - return enclose ? "

" - + ttext + "

" - : ttext; + return (enclose ? "" : "") + + "

" + + ttext + "

" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -123,8 +120,8 @@ public final class JvSwingUtils for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++) { if (menu.getMenuComponent(i) instanceof JMenu - && ((JMenu) menu.getMenuComponent(i)).getText().equals( - submenu)) + && ((JMenu) menu.getMenuComponent(i)).getText() + .equals(submenu)) { submenuinstance = (JMenu) menu.getMenuComponent(i); } @@ -202,8 +199,10 @@ public final class JvSwingUtils public static Font getLabelFont(boolean bold, boolean italic) { - return new java.awt.Font("Verdana", (!bold && !italic) ? Font.PLAIN - : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), 11); + return new java.awt.Font("Verdana", + (!bold && !italic) ? Font.PLAIN + : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), + 11); } /** @@ -279,8 +278,8 @@ public final class JvSwingUtils * of possible positions. */ float fraction = proportion - * (scrollbar.getMaximum() - scrollbar.getMinimum() - scrollbar - .getModel().getExtent()) + * (scrollbar.getMaximum() - scrollbar.getMinimum() + - scrollbar.getModel().getExtent()) + (scrollbar.getModel().getExtent() / 2f); return Math.min(Math.round(fraction), scrollbar.getMaximum()); }