Merge pull request #104 from BobHanson/hanson1

BobHanson · web-flow · commit a98b5176c3c0 · 2019-07-03T09:11:28.000+01:00
checkbox setting issues resolved
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 @@
-20190702213116 
+20190703083607 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190702213116 
+20190703083607 
diff --git a/sources/net.sf.j2s.java.core/TODO.txt b/sources/net.sf.j2s.java.core/TODO.txt
@@ -1,3 +1,4 @@
+2019.07.03 bypass ButtonListener.verifyButtonClick if "checked" is set programmatically
 2019.07.01 working on JSEditorPaneUI tab business
 2019.07.01 AppContext.getApplet(name) initial work
 2019.07.01 working on JTable key navigation events
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/ButtonListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java
@@ -329,8 +329,9 @@ public void mouseExited(MouseEvent e) {
 	}
 
 	/**
-	 * Just ensure the button is in sync by forcing the HTML5 DOM button to the same
-	 * setting as Java.
+	 * It is necessary that this method be called any time the "CHECKED" attribute
+	 * of a toggle button is changed. Otherwise it may fire for a previous state
+	 * after the state is changed in code directly.
 	 * 
 	 * @param m
 	 * 
@@ -339,12 +340,13 @@ public void mouseExited(MouseEvent e) {
 	boolean verifyButtonClick(AbstractButton b) {
 		ButtonModel m = b.getModel();
 		DOMNode btn = ui.actionNode;
-		// BH: I don't know that this is necessary anymore
-		boolean state = m.isSelected();// && !ui.isRadio;
+		boolean state = m.isSelected();
 		/**
 		 * @j2sNative
 		 * 
-		 * 			setTimeout(function(){btn && (btn.checked = state)}, 0);
+		 * 			setTimeout(function(){
+		 * btn && btn.checked != state && (btn.checked = state);
+		 *  }, 0);
 		 */
 		{
 			System.out.println("" + btn + state);
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
@@ -1506,6 +1506,7 @@ protected DOMNode setCssFont(DOMNode obj, Font font) {
 					"font-weight", ((istyle & Font.BOLD) == 0 ? "normal" : "bold"));
 		}
 
+		// force the issue
 		enabled = !c.isEnabled();
 		setEnabled(c.isEnabled());
 		return obj;
@@ -2110,7 +2111,7 @@ protected void enableNode(DOMNode node, boolean b) {
 		if (node == null)
 			return;
 		
-		DOMNode.setAttr(node, "disabled", (b ? null : TRUE));
+		DOMNode.setAttr(node, "disabled", (b ? FALSE : TRUE));
 		if (!b && inactiveForeground == colorUNKNOWN)
 			getDisabledColors(buttonNode == null ? getPropertyPrefix() : "Button");
 		if (jc.isOpaque()) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRadioButtonUI.java
@@ -77,9 +77,8 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 
 	protected void setupButton(JToggleButton b, boolean doAll) {
 		// actionNode, iconNode, textNode, centeringNode, buttonNode
-				
-		DOMNode.setAttr(actionNode, "checked", b.isSelected() ? TRUE : null);
-		
+		DOMNode.setAttr(actionNode, "checked", b.isSelected() ? TRUE : FALSE);
+		buttonListener.verifyButtonClick(b); // necessary!
 		setCssFont(textNode, c.getFont());
 		// TODO: not allowing radio/checkbox icons (custom buttons)
 		setIconAndText("radio", (ImageIcon) null/* button.getIcon() */, button.getIconTextGap(), button.getText());
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java
@@ -130,7 +130,7 @@ public abstract class JSTextUI extends JSLightweightUI {// implements {ViewFacto
 	protected static final EditorKit defaultKit = new DefaultEditorKit();
 	
 	static final Point markDot = new Point();
-		
+
 	transient JTextComponent editor;
 	protected boolean editable = true;
     protected RootView rootView = new RootView();
@@ -293,7 +293,7 @@ protected void setColors(String prefix) {
 		if ((dfg == null) || (dfg instanceof UIResource)) {
 			editor.setDisabledTextColor(UIManager.getColor(prefix + ".inactiveForeground"));
 		}
-		dfg = UIManager.getColor(prefix + ".inactiveBackground");
+		dfg =  UIManager.getColor(editor.秘isAWT() ? "control" : prefix + ".inactiveBackground");
 		if (dfg != null)
 			inactiveBackground = dfg;
 

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,9 @@ public void mouseExited(MouseEvent e) {`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`/**`
`332`		`- * Just ensure the button is in sync by forcing the HTML5 DOM button to the same`
`333`		`- * setting as Java.`
	`332`	`+ * It is necessary that this method be called any time the "CHECKED" attribute`
	`333`	`+ * of a toggle button is changed. Otherwise it may fire for a previous state`
	`334`	`+ * after the state is changed in code directly.`
`334`	`335`	`*`
`335`	`336`	`* @param m`
`336`	`337`	`*`
`@@ -339,12 +340,13 @@ public void mouseExited(MouseEvent e) {`
`339`	`340`	`boolean verifyButtonClick(AbstractButton b) {`
`340`	`341`	`ButtonModel m = b.getModel();`
`341`	`342`	`DOMNode btn = ui.actionNode;`
`342`		`- // BH: I don't know that this is necessary anymore`
`343`		`- boolean state = m.isSelected();// && !ui.isRadio;`
	`343`	`+ boolean state = m.isSelected();`
`344`	`344`	`/**`
`345`	`345`	`* @j2sNative`
`346`	`346`	`*`
`347`		`- * setTimeout(function(){btn && (btn.checked = state)}, 0);`
	`347`	`+ * setTimeout(function(){`
	`348`	`+ * btn && btn.checked != state && (btn.checked = state);`
	`349`	`+ * }, 0);`
`348`	`350`	`*/`
`349`	`351`	`{`
`350`	`352`	`System.out.println("" + btn + state);`