jQuery.ui.j2smenu adaptation of jQuery.ui.menu

hansonr · hansonr · commit db0a9ea364d7 · 2019-01-21T00:06:48.000-06:00
actions all set to doCmd() function for clarity and debugging
fully isolated from the original ui.menu
adds many useful features
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 @@
-20190119065335 
+20190121000416 
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 @@
-20190119065335 
+20190121000416 
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/jquery/JQueryUI.java b/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java
@@ -2,18 +2,18 @@
 
 /**
  * This "class" simply checks for jQuery.ui having been loaded and loads it if it has not been loaded.
- * Used by swingjs.plaf.JSSliderUI
+ * Used by swingjs.plaf.JSSliderUI and swingjs.plaf.JSPopupMenuUI
  * 
  * Note that if you change one of the JavaScript files in this directory, 
  * the transpiler will not transfer it to the site directory unless you touch this java file.
  * 
  * @author Bob Hanson   
  *  
- *    
+ *     
  */  
-public class JQueryUI {  
+public class JQueryUI { 
  
-	public JQueryUI() {  
+	public JQueryUI() { 
 		// for reflection 
 	}
 	static { 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -58,6 +58,7 @@ try{
 		 // BH 2018
 		 // -- added stopPropagation
 		 // -- changed to mouseover from mouseenter, since we have children
+		 me.clickoutDiasabled = false;
 		 var a = e(t.target).closest("li")
 		 if (a.hasClass(".ui-state-focus"))
 			 return;		 
@@ -80,10 +81,14 @@ try{
 				||(me.element.trigger("focus",[!0]),me.active&&me.active.parents(".ui-j2smenu").length===1&&clearMe(me.timer, trigger))); 
 		doCmd("_hide", me, e, e(".ui-j2smenu"));
 		break;
+	 case "noclickout":
+		 me.clickoutDiasabled = true;
+		 setTimeout(function(){me.clickoutDiasabled = false;},50);
+		 return;
 	 case "onclick_out":
-		 e(t.target).closest(".j2s-menuBar-menu").length == 0 
+		 me.clickoutDiasabled || e(t.target).closest(".j2s-menuBar-menu").length == 0 
 		    && (e(t.target).closest(".ui-j2smenu").length||me.collapseAll(t));
-	 	break;
+	 	return;
 	 case "onleave":
 		 me.collapseAll(t);
 		 break;
@@ -280,6 +285,8 @@ try{
  
  _create:function(){
 	 
+	 this.clickoutDiasabled = true;
+	 
 	 if (typeof this.options.delay == "number")
 		 this.delay = this.options.delay;
 	 
@@ -391,7 +398,7 @@ try{
  refresh:function(t,n){        doCmd("refresh", this, e, t, n); },
  expand:function(t){        doCmd("expand", this, e, t);},
  select:function(t){ doCmd("select", this, e, t); },
- 
+ noclickout:function() { doCmd("noclickout", this); }, 
  next:function(t){this._move("next","first",t)},
  previous:function(t){this._move("prev","last",t)},
  isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-j2smenu-item").length},
@@ -478,6 +485,9 @@ Swing.setMenu = function(menu) {
 	Swing.__getMenuStyle && J2S.$after("head", '<style>'+Swing.__getMenuStyle(menu._applet)+'</style>');  
 	Swing.__getMenuStyle = null; // "static"
   if (menu.uiClassID) {
+	  
+	// TODO: We can't be creating fields in JPopupMenu! This is ancient stuff.
+	  
     menu._visible = false;
     menu._j2sname = menu.id = menu.ui.id + '_' + (++Swing.menuCounter);
     menu.$ulTop = J2S.__$(); // empty jQuery selector
@@ -554,10 +564,13 @@ Swing.showMenu = function(menu, x, y) {
   if (J2S._showMenuCallback)
 	J2S._showMenuCallback(menu, x, y);
   var wasTainted = menu._tainted;
+  
+  // TODO: We can't be creating fields in JPopupMenu!
+  
   if (menu._tainted)
 	  Swing.updateMenu(menu);
   menu.setPosition(x, y);
-  menu.$ulTop.hide().j2smenu().show();  
+  menu.$ulTop.hide().j2smenu("noclickout").show();  
   menu._visible = true;
   menu.timestamp = System.currentTimeMillis$();
   menu.dragBind(true);
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
@@ -36,6 +36,7 @@
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
+import javax.swing.JRootPane;
 import javax.swing.JTable.BooleanRenderer;
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
@@ -1292,21 +1293,23 @@ protected void setMnemonic(int newValue) {
 	
 	protected boolean imagePersists;
 
-	private boolean allowDivOverflow;
+	protected boolean allowDivOverflow;
 
 
 	/**
-	 * we can allow frames -- particularly JInternalFrames -- to overflow.
+	 * we can allow frames -- particularly JInternalFrames in a JDesktopFrame -- to overflow.
 	 * 
 	 * To do this, we need to make this indication for both the Root pane and the
-	 * contentPane for the parent JFrame:
+	 * contentPane for the parent JFrame, as well as the JDesktopPane, if that pane is not the contentPane. 
+	 * The developer need only indicate this for the rootPane
 	 * 
 	 * this.getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
 	 * 
 	 * 
 	 */
 	protected void checkAllowDivOverflow() {
-		allowDivOverflow = "false".equals(jc.getRootPane().getClientProperty("swingjs.overflow.hidden"));
+		JRootPane root = jc.getRootPane();
+		allowDivOverflow = (root != null && "false".equals(root.getClientProperty("swingjs.overflow.hidden")));
 	}
 
 	public void setAllowPaintedBackground(boolean TF) {
@@ -2363,7 +2366,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 						"margin", "0px 5px",
 						"transform", "translateY(15%)");
 			}
-			DOMNode.setStyles(menuAnchorNode, "width", "95%", "min-width", (wCtr + wAccel + margins.left + margins.right) + "px");			
+			DOMNode.setStyles(menuAnchorNode, "width", "90%", "min-width", Math.max(75,(wCtr + wAccel + margins.left + margins.right)*1.1) + "px");			
 		}
 
 		if (alignHCenter) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSDesktopPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSDesktopPaneUI.java
@@ -26,7 +26,6 @@
 
 import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
-import swingjs.JSUtil;
 import swingjs.api.js.DOMNode;
 
 public class JSDesktopPaneUI extends JSPanelUI {
@@ -49,6 +48,7 @@ public DOMNode updateDOMNode() {
 		if (isNew) {
 			$(domNode).addClass("swingjs-desktop");
 		}		
+		checkAllowDivOverflow();
 		return domNode;
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuBarUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuBarUI.java
@@ -30,6 +30,7 @@
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
@@ -120,6 +121,12 @@ protected int getContainerHeight() {
 		return height = menuBar.getFont().getFontMetrics().getHeight();
 	}
 
+	@Override
+	public Insets getInsets() {
+		return new Insets(2,10,2,10);
+		
+	}
+	
 	@Override
 	public Dimension getPreferredSize(JComponent jc) {
 		// layout manager will call this specifically for the height
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
@@ -26,7 +26,7 @@ public DOMNode updateDOMNode() {
 				DOMNode.setVisible(domNode,  false);
 		}
 		isContentPane = (root != null && jc == root.getContentPane());
-		if (isContentPane) 
+		if (isContentPane)
 			checkAllowDivOverflow();
 		return updateDOMNodeCUI();
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -171,12 +171,6 @@ public void mouseClicked(MouseEvent e) {
 
 			@Override
 			public void mousePressed(MouseEvent e) {
-				// TODO Auto-generated method stub
-
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
 				//System.out.println(e.getButton());
 				if (e.getButton() != MouseEvent.BUTTON3)
 					return;
@@ -186,6 +180,17 @@ public void mouseReleased(MouseEvent e) {
 				pmenu.show(frame, e.getX(), e.getY() - 10);
 			}
 
+			@Override
+			public void mouseReleased(MouseEvent e) {
+//				//System.out.println(e.getButton());
+//				if (e.getButton() != MouseEvent.BUTTON3)
+//					return;
+//				int n = pmenu.getComponentCount();
+//				if (n > 1)
+//					pmenu.remove(n - 1);
+//				pmenu.show(frame, e.getX(), e.getY() - 10);
+			}
+
 			@Override
 			public void mouseEntered(MouseEvent e) {
 				// TODO Auto-generated method stub
@@ -224,7 +229,7 @@ Container getVisualPaneContent(JMenu menu, JMenu menu1, JMenu menu2) {
 		Font font = new Font("Verdana", Font.PLAIN, 12);
 
 		JPanel panel = new JPanel();
-		panel.setPreferredSize(new Dimension(400, 500));
+		panel.setPreferredSize(new Dimension(400, 600));
 		panel.setOpaque(true);
 		panel.setLayout(new BorderLayout());
 
@@ -291,7 +296,7 @@ Container getVisualPaneContent(JMenu menu, JMenu menu1, JMenu menu2) {
 		firstColumn.add(rb1);
 		firstColumn.add(rb2);
 		firstColumn.add(rb3);
-		firstColumn.setBounds(100, 40, 200, 300);
+		firstColumn.setBounds(100, 40, 200, 500);
 
 		JMenuItem cb3m = new JMenuItem("XXleading,left-to-rightXX");
 		cb3m.setFont(font);
@@ -445,7 +450,7 @@ public void actionPerformed(ActionEvent e) {
 					@Override
 					public void actionPerformed(ActionEvent e) {
 						menu.remove(testbtn);
-						System.out.println("removing testbtn");
+						System.out.println("JalviewJSTest removing testbtn");
 					}
 
 				});
@@ -458,6 +463,8 @@ public void actionPerformed(ActionEvent e) {
 					@Override
 					public void actionPerformed(ActionEvent e) {
 						testbtn.setText("test" + ++ntest);
+						System.out.println("JalviewJSTest adding testbtn");
+						
 						menu.add(testbtn);
 
 					}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Event.java b/sources/net.sf.j2s.java.core/src/test/Test_Event.java
@@ -173,6 +173,9 @@ public Test_Event() {
 
 		if (asInternalFrame) {
 			JDesktopPane d = new JDesktopPane();
+			// this next allows floating frames outside the JDesktopPane in SwingJS
+			d.putClientProperty("swingjs.overflow.hidden", "false");
+
 			d.setPreferredSize(new Dimension(800, 600));
 
 			JInternalFrame main = new JInternalFrame();
@@ -252,9 +255,7 @@ public void mouseExited(MouseEvent e) {
 			d.add(main2);
 			
 
-			setContentPane(d);
-			// these next two allow floating frames outside the JDesktopPane
-			getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
+			add(d);
 			pack();
 			setVisible(true);
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js

Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,18 @@`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* This "class" simply checks for jQuery.ui having been loaded and loads it if it has not been loaded.`
`5`		`- * Used by swingjs.plaf.JSSliderUI`
	`5`	`+ * Used by swingjs.plaf.JSSliderUI and swingjs.plaf.JSPopupMenuUI`
`6`	`6`	`*`
`7`	`7`	`* Note that if you change one of the JavaScript files in this directory,`
`8`	`8`	`* the transpiler will not transfer it to the site directory unless you touch this java file.`
`9`	`9`	`*`
`10`	`10`	`* @author Bob Hanson`
`11`	`11`	`*`
`12`		`- *`
	`12`	`+ *`
`13`	`13`	`*/`
`14`		`-public class JQueryUI {`
	`14`	`+public class JQueryUI {`
`15`	`15`
`16`		`- public JQueryUI() {`
	`16`	`+ public JQueryUI() {`
`17`	`17`	`// for reflection`
`18`	`18`	`}`
`19`	`19`	`static {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`import javax.swing.JMenu;`
`37`	`37`	`import javax.swing.JMenuItem;`
`38`	`38`	`import javax.swing.JPopupMenu;`
	`39`	`+import javax.swing.JRootPane;`
`39`	`40`	`import javax.swing.JTable.BooleanRenderer;`
`40`	`41`	`import javax.swing.KeyStroke;`
`41`	`42`	`import javax.swing.SwingConstants;`
`@@ -1292,21 +1293,23 @@ protected void setMnemonic(int newValue) {`
`1292`	`1293`
`1293`	`1294`	`protected boolean imagePersists;`
`1294`	`1295`
`1295`		`- private boolean allowDivOverflow;`
	`1296`	`+ protected boolean allowDivOverflow;`
`1296`	`1297`
`1297`	`1298`
`1298`	`1299`	`/**`
`1299`		`- * we can allow frames -- particularly JInternalFrames -- to overflow.`
	`1300`	`+ * we can allow frames -- particularly JInternalFrames in a JDesktopFrame -- to overflow.`
`1300`	`1301`	`*`
`1301`	`1302`	`* To do this, we need to make this indication for both the Root pane and the`
`1302`		`- * contentPane for the parent JFrame:`
	`1303`	`+ * contentPane for the parent JFrame, as well as the JDesktopPane, if that pane is not the contentPane.`
	`1304`	`+ * The developer need only indicate this for the rootPane`
`1303`	`1305`	`*`
`1304`	`1306`	`* this.getRootPane().putClientProperty("swingjs.overflow.hidden", "false");`
`1305`	`1307`	`*`
`1306`	`1308`	`*`
`1307`	`1309`	`*/`
`1308`	`1310`	`protected void checkAllowDivOverflow() {`
`1309`		`- allowDivOverflow = "false".equals(jc.getRootPane().getClientProperty("swingjs.overflow.hidden"));`
	`1311`	`+ JRootPane root = jc.getRootPane();`
	`1312`	`+ allowDivOverflow = (root != null && "false".equals(root.getClientProperty("swingjs.overflow.hidden")));`
`1310`	`1313`	`}`
`1311`	`1314`
`1312`	`1315`	`public void setAllowPaintedBackground(boolean TF) {`
`@@ -2363,7 +2366,7 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2363`	`2366`	`"margin", "0px 5px",`
`2364`	`2367`	`"transform", "translateY(15%)");`
`2365`	`2368`	`}`
`2366`		`- DOMNode.setStyles(menuAnchorNode, "width", "95%", "min-width", (wCtr + wAccel + margins.left + margins.right) + "px");`
	`2369`	`+ DOMNode.setStyles(menuAnchorNode, "width", "90%", "min-width", Math.max(75,(wCtr + wAccel + margins.left + margins.right)*1.1) + "px");`
`2367`	`2370`	`}`
`2368`	`2371`
`2369`	`2372`	`if (alignHCenter) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`import sun.swing.DefaultLookup;`
`28`	`28`	`import sun.swing.UIAction;`
`29`		`-import swingjs.JSUtil;`
`30`	`29`	`import swingjs.api.js.DOMNode;`
`31`	`30`
`32`	`31`	`public class JSDesktopPaneUI extends JSPanelUI {`
`@@ -49,6 +48,7 @@ public DOMNode updateDOMNode() {`
`49`	`48`	`if (isNew) {`
`50`	`49`	`$(domNode).addClass("swingjs-desktop");`
`51`	`50`	`}`
	`51`	`+ checkAllowDivOverflow();`
`52`	`52`	`return domNode;`
`53`	`53`	`}`
`54`	`54`