JSTableUI uses own canvas

hansonr · hansonr · commit 5eab2f4eb3b1 · 2021-02-27T07:15:10.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210213105349 
+20210227071344 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210213105349 
+20210227071344 
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
@@ -1301,7 +1301,7 @@ public void propertyChange(PropertyChangeEvent e) {
 		String prop = e.getPropertyName();
 		Object value = e.getNewValue();
 		if (prop == "jscanvas") {
-			addLocalCanvas();
+			addLocalCanvas(false);
 		}
 		if (domNode == null)
 			return;
@@ -1320,8 +1320,8 @@ public void propertyChange(PropertyChangeEvent e) {
 		propertyChangedCUI(e, prop);
 	}
 	
-	protected void addLocalCanvas() {
-		if (jc.秘g != null)
+	protected void addLocalCanvas(boolean forceNew) {
+		if (jc.秘g != null && !forceNew)
 			return;
 		jc.秘g = (JSGraphics2D)(Object) Boolean.TRUE;
 		setTainted();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java
@@ -254,7 +254,7 @@ protected void setBorder(String prefix) {
 	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		String prop = e.getPropertyName();
-		System.out.println("JSEPUI prop " + prop);
+		//System.out.println("JSEPUI prop " + prop);
 		switch(prop) {
 		case "editorKit":
 			isHtmlKit = (editor.秘jsHTMLHelper != null);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPanelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPanelUI.java
@@ -32,7 +32,7 @@ public DOMNode updateDOMNode() {
 			}
 		}
 		if (isGlassPane) {
-			addLocalCanvas();
+			addLocalCanvas(false);
 			DOMNode.setZ(domNode, 1);
 		}
 		isContentPane = (root != null && jc == root.getContentPane());
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java
@@ -63,7 +63,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
-import javax.swing.JViewport;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 import javax.swing.LookAndFeel;
@@ -86,7 +85,6 @@
 import sun.swing.DefaultLookup;
 import sun.swing.SwingUtilities2;
 import sun.swing.UIAction;
-import swingjs.JSMouse;
 import swingjs.api.js.DOMNode;
 
 /**
@@ -112,6 +110,14 @@ public class JSTableUI extends JSPanelUI {
 		
 	private boolean isScrolling, justLaidOut;
 
+//	private DOMNode canvasNode;
+//
+//	public DOMNode getCanvasNode() {
+//		return canvasNode;
+//	}
+	
+	private DOMNode tableNode;
+
 	public void setScrolling() {
 		// from JSScrollPane
 		isScrolling = true;
@@ -122,6 +128,11 @@ public JSTableUI() {
 		isTable = true;
 	}
 
+	public DOMNode getDOMNode() {
+		return updateDOMNode();
+	}
+
+
 	@Override
 	public DOMNode updateDOMNode() {
 
@@ -135,8 +146,13 @@ public DOMNode updateDOMNode() {
 
 		if (domNode == null) {
 			domNode = newDOMObject("div", id);
+			tableNode = domNode;
+//			canvasNode = newDOMObject("canvas", id + "_canvas");
+//			tableNode = newDOMObject("div", id + "_table");
+//			domNode.appendChild(canvasNode);
+//			domNode.appendChild(tableNode);
 			enableJSKeys(true);
-			DOMNode.setStyle(domNode,  "outline", "none");
+			DOMNode.setStyle(tableNode,  "outline", "none");
 			// bindJSKeyEvents(domNode, true);
 		}
 		if (rebuild) {
@@ -150,12 +166,13 @@ public DOMNode updateDOMNode() {
 		if (w != oldWidth || h != oldHeight) {
 			oldWidth = w;
 			oldHeight = h;
-			DOMNode.setStyles(domNode, "width", w + "px", "height", h + "px");
+			DOMNode.setStyles(tableNode, "width", w + "px", "height", h + "px");
+//			DOMNode.setStyles(canvasNode, "width", w + "px", "height", h + "px");
 		}
 		Font font = c.getFont();
 		if (!font.equals(oldFont)) {
 			oldFont = font;
-			setCssFont(domNode, c.getFont());
+			setCssFont(tableNode, c.getFont());
 		}
 		return updateDOMNodeCUI();
 	}
@@ -337,7 +354,8 @@ protected void addChildrenToDOM(Component[] children, int n) {
 				}
 			}
 
-			$(domNode).empty();
+			$(tableNode).empty();
+			addLocalCanvas(true);
 			rminy = tmpRect.y;
 			rmaxy = tmpRect.y + tmpRect.height;
 			if (tmpRect.height != 0) {
@@ -408,7 +426,7 @@ private DOMNode addElements(int rminx, int rminy, int rmaxx, int rmaxy, int h, i
 			boolean rowExists = (tr != null);
 			if (!rowExists) {
 				tr = DOMNode.createElement("div", rid);
-				domNode.appendChild(tr);
+				tableNode.appendChild(tr);
 			}
 			DOMNode.setStyle(tr, "height", h + "px");
 			col = col1;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSViewportUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSViewportUI.java
@@ -29,12 +29,12 @@
 package swingjs.plaf;
 
 import java.awt.Dimension;
-import java.awt.Rectangle;
 import java.beans.PropertyChangeListener;
 
 import javax.swing.JComponent;
 import javax.swing.JViewport;
 import javax.swing.event.ChangeListener;
+
 import swingjs.api.js.DOMNode;
 
 public class JSViewportUI extends JSLightweightUI implements PropertyChangeListener,

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public DOMNode updateDOMNode() {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`if (isGlassPane) {`
`35`		`- addLocalCanvas();`
	`35`	`+ addLocalCanvas(false);`
`36`	`36`	`DOMNode.setZ(domNode, 1);`
`37`	`37`	`}`
`38`	`38`	`isContentPane = (root != null && jc == root.getContentPane());`