JToolTip (still issues with HTML)

BobHanson · BobHanson · commit cf340a423bd4 · 2018-06-21T09:14:52.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/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -350,6 +350,12 @@ public void setDraggable(JSFunction f) {
 	private boolean canAlignText;
 	private boolean canAlignIcon;
 
+	/**
+	 * set false for tool tip or other non-label object that has text
+	 * 
+	 */
+	protected boolean allowTextAlignment = true;
+
 	public JSComponentUI() {
 		setDoc();
 	}
@@ -756,13 +762,14 @@ protected void setIconAndText(String prop, ImageIcon icon, int gap,
 				iconHeight = icon.getIconHeight();
 			}
 		}
+		boolean isHTML = false;
 		if (text == null || text.length() == 0) {
 			text = "";
 			if (icon != null)
 				canAlignIcon = true;
 		} else {
 			if (icon == null) {
-				canAlignText = true;
+				canAlignText = allowTextAlignment;
 			} else {
 				//vCenter(imageNode, 10); // perhaps? Not sure if this is a good idea
 				if (gap == Integer.MAX_VALUE)
@@ -771,15 +778,20 @@ protected void setIconAndText(String prop, ImageIcon icon, int gap,
 					DOMNode.addHorizontalGap(iconNode, gap);
 			}
 			if (text.indexOf("<html>") == 0) {
+				isHTML = true;
 				// PhET uses <html> in labels and uses </br>
 				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);
 			}
 		}
 		DOMNode obj = null;
 		if (textNode != null) {
 			prop = "innerHTML";
 			obj = textNode;
-			text = PT.rep(text, "<", "&lt;");
+			if (!isHTML)
+				text = PT.rep(text, "<", "&lt;");
 		} else if (valueNode != null) {
 			prop = "value";
 			obj = valueNode;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java
@@ -8,13 +8,18 @@
 import swingjs.api.js.DOMNode;
 
 /**
- * A JavaScript equivalent for a label.  
+ * A JavaScript equivalent for a label.
+ * 
+ *   Also used for ToolTip
  * 
  * @author Bob Hanson
  *
  */
 public class JSLabelUI extends JSLightweightUI {
 	private JLabel label;
+	protected ImageIcon icon;
+	protected int gap;
+	protected String text;
 
 	public JSLabelUI() {
 		setDoc();
@@ -33,8 +38,8 @@ protected DOMNode updateDOMNode() {
 			centeringNode.appendChild(textNode);
 			domNode.appendChild(centeringNode);
 		}
-		setIconAndText("label", (ImageIcon) label.getIcon(),
-				label.getIconTextGap(), label.getText());
+		getIconAndText(); // could be ToolTip
+		setIconAndText("label", icon, gap, text);
 		DOMNode.setStyles(domNode, "position", "absolute", "width", c.getWidth()
 				+ "px", "height", c.getHeight() + "px");
 		if (actualHeight > 0)
@@ -50,6 +55,13 @@ protected DOMNode updateDOMNode() {
 
 	}
 
+	protected void getIconAndText() {		
+		icon = (ImageIcon) label.getIcon();
+		gap = label.getIconTextGap();
+		text = label.getText();
+	}
+
+
 	/**
 	 * adding in outer styles for text alignment of a label
 	 */
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSToolTipUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSToolTipUI.java
@@ -1,57 +1,42 @@
 package swingjs.plaf;
 
-
-import java.awt.Dimension;
-
 import javax.swing.JComponent;
-import javax.swing.JRootPane;
+import javax.swing.JToolTip;
 import javax.swing.LookAndFeel;
-import swingjs.api.js.DOMNode;
 
-public class JSToolTipUI extends JSLightweightUI {
+public class JSToolTipUI extends JSLabelUI {
 
-	int frameZ = 10000;
+	// TODO: allow generic tool tip, not just text
+	
 	public JSToolTipUI() {
-		isContainer = true;
-		setDoc();
+		super();
+		allowTextAlignment = false;
 	}
 	
-	@Override
-	protected DOMNode updateDOMNode() {
-		if (domNode == null) {
-			JRootPane root = jc.getRootPane();
-			//isContentPane = (root != null && jc == root.getContentPane());
-			domNode = newDOMObject("div", id);
-			DOMNode.setVisible(domNode,  false);
-		}
-    return domNode;
-	}
+	protected JToolTip toolTip;
 
 	@Override
-  protected Dimension setHTMLSize(DOMNode obj, boolean addCSS) {
-		// SwingJS for now: just designated container width/height 
-		return new Dimension(c.getWidth(), c.getHeight());
+	protected void getIconAndText() {		
+		icon = null;
+		gap = 0;
+		text = toolTip.getTipText();
 	}
-	
 
 	@Override
 	public void installUI(JComponent jc) {
-    LookAndFeel.installColorsAndFont(jc,
-        "Panel.background",
-        "Panel.foreground",
-        "Panel.font");
+		toolTip = (JToolTip) jc;		
+		LookAndFeel.installColorsAndFont(jc, "ToolTip.background", "ToolTip.foreground",
+        "Tooltip.font");
 	}
 
+
 	@Override
 	public void uninstallUI(JComponent jc) {
+		System.out.println("Uninstalling ToolTipUI");
+		// should remove dom node?
 		// TODO Auto-generated method stub
 		
 	}
 
-	@Override
-	public Dimension getPreferredSize() {
-  	return null;
-  }
-
 
 }
