JToolTip fixed; now heavyweight

BobHanson · BobHanson · commit 8975a820b0c1 · 2018-06-21T12:33:41.000+01:00
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/ToolTipManager.java b/sources/net.sf.j2s.java.core/src/javax/swing/ToolTipManager.java
@@ -100,7 +100,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
     private KeyListener accessibilityKeyListener = null;
 
     // PENDING(ges)
-    protected boolean lightWeightPopupEnabled = true;
+    protected boolean lightWeightPopupEnabled = false; // BH 2018 true;
     protected boolean heavyWeightPopupEnabled = false;
 
     ToolTipManager() {
@@ -311,7 +311,7 @@ else if (location.y - sBounds.y + size.height > sBounds.height) {
 
             PopupFactory popupFactory = PopupFactory.getSharedInstance();
 
-            if (lightWeightPopupEnabled) {
+            if (false && lightWeightPopupEnabled) { // BH 2018 
         int y = getPopupFitHeight(popupRect, insideComponent);
         int x = getPopupFitWidth(popupRect,insideComponent);
         if (x>0 || y>0) {
@@ -321,7 +321,7 @@ else if (location.y - sBounds.y + size.height > sBounds.height) {
         }
             }
             else {
-                popupFactory.setPopupType(PopupFactory.MEDIUM_WEIGHT_POPUP);
+                popupFactory.setPopupType(PopupFactory.HEAVY_WEIGHT_POPUP);//PopupFactory.MEDIUM_WEIGHT_POPUP);
             }
         tipWindow = popupFactory.getPopup(insideComponent, tip,
                           location.x,
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -783,7 +783,9 @@ protected void setIconAndText(String prop, ImageIcon icon, int gap,
 				text = PT.rep(text.substring(6, text.length() - 7), "</br>", "");
 				text = PT.rep(text,  "</html>", "");
 				text = PT.rep(text, "href=", "target=_blank href=");
-				System.out.println(text);
+				text = PT.rep(text, "href=", "target=_blank href=");
+				// Jalview hack
+				text = PT.rep(text, "width: 350; text-align: justify; word-wrap: break-word;", "width: 350px; word-wrap: break-word;");
 			}
 		}
 		DOMNode obj = null;

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,9 @@ protected void setIconAndText(String prop, ImageIcon icon, int gap,`
`783`	`783`	`text = PT.rep(text.substring(6, text.length() - 7), "</br>", "");`
`784`	`784`	`text = PT.rep(text, "</html>", "");`
`785`	`785`	`text = PT.rep(text, "href=", "target=_blank href=");`
`786`		`- System.out.println(text);`
	`786`	`+ text = PT.rep(text, "href=", "target=_blank href=");`
	`787`	`+ // Jalview hack`
	`788`	`+ text = PT.rep(text, "width: 350; text-align: justify; word-wrap: break-word;", "width: 350px; word-wrap: break-word;");`
`787`	`789`	`}`
`788`	`790`	`}`
`789`	`791`	`DOMNode obj = null;`