misc fixes

hansonr · hansonr · commit 566519639825 · 2018-11-17T23:20:16.000-06:00
adds move cursor for JSplitPane
corrects EventDispatchThread miscoding
adds dummy frame consideration for SwingUtilities.SharedOwnerFrame
sets mouse click for multiple click from jqevent.originalEvent
adds JSplitPane drag cursor on mouse move
fixes JComboBox not being disabled
fixes early setCursor before peer is created
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 @@
-20181117145755 
+20181117231441 
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 @@
-20181117145755 
+20181117231441 
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/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -2884,7 +2884,8 @@ final void updateCursorImmediately() {
 		// cPeer.updateCursorImmediately();
 		// }
 		// } else if (peer != null) {
-		 peer.updateCursorImmediately();
+		if (peer != null)
+			peer.updateCursorImmediately();
 		// }
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java b/sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java
@@ -96,8 +96,8 @@ public void run() {
 			}
 		};
 		JSThread me = this;
-		JSFunction f = /** @j2sNative  function() {r.run$();me.run1$I(mode)} || */ null; 		
 		int mode = LOOP;
+		JSFunction f = /** @j2sNative  function() {r.run$();me.run1$I(mode)} || */ null;
 		JSToolkit.dispatch(f, 0, 0);
 		// handling sleepAndReturn myself
 		// and once through only
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java
@@ -288,6 +288,11 @@ public JFrame(String title, GraphicsConfiguration gc, String uiid) {
 		rootPane.addNotify(); // builds a peer for the root pane
 	}
 
+	public JFrame(Object object, Object object2, Object object3, Object object4) {
+		uiClassID = "FrameUI";
+		
+	}
+
 	private static int frameCount;
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/SwingUtilities.java b/sources/net.sf.j2s.java.core/src/javax/swing/SwingUtilities.java
@@ -1765,7 +1765,7 @@ public static ActionMap getUIActionMap(JComponent component) {
     static class SharedOwnerFrame extends JFrame implements WindowListener {
     	
     	SharedOwnerFrame() {
-    		super(); // required by SwingJS
+    		super(null, null, null, null); // required by SwingJS
     	}
     	
         @Override
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java b/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java
@@ -183,7 +183,7 @@ private void clicked(long time, int x, int y, int modifiers, int clickCount) {
 		// clearKeyBuffer();
 		// clickedCount is not reliable on some platforms
 		// so we will just deal with it ourselves
-		mouseAction(MouseEvent.MOUSE_CLICKED, time, x, y, 1, modifiers, 0);
+		mouseAction(MouseEvent.MOUSE_CLICKED, time, x, y, clickCount, modifiers, 0);
 	}
 
 	private boolean isCtrlShiftMouseDown; // Macintosh may not recognize CTRL-SHIFT-LEFT as
@@ -278,7 +278,7 @@ private void mouseAction(int id, long time, int x, int y, int xcount,
 				extended == InputEvent.META_DOWN_MASK ||
 				JSToolkit.isMac && extended == (InputEvent.CTRL_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK));
 		int button = getButton(modifiers);
-		int count = updateClickCount(id, time, x, y);
+		int count = (xcount > 1 && id == MouseEvent.MOUSE_CLICKED ? xcount : updateClickCount(id, time, x, y));
 
 		Component source = viewer.getTopComponent(); // may be a JFrame
 		MouseEvent e;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -436,8 +436,8 @@ private static void invokeAndWait(JSFunction f, int id) {
 		 *              var id0 = SwingJS.eventID || 0;
 		 *              SwingJS.eventID = id;
 		 *              java.lang.Thread.thisThread = thread; 
-		 *              if (f.run)
-		 *                f.run();
+		 *              if (f.run$)
+		 *                f.run$();
 		 *              else
 		 *                f();
 		 *              SwingJS.eventID = id0;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComboBoxUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComboBoxUI.java
@@ -4,8 +4,6 @@
 import javajs.util.PT;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
@@ -23,7 +21,7 @@
  * 
  */
 
-public class JSComboBoxUI extends JSLightweightUI implements PropertyChangeListener, ItemListener, ListDataListener {
+public class JSComboBoxUI extends JSLightweightUI implements ItemListener, ListDataListener {
 
 	private JComboBox comboBox;
 
@@ -43,11 +41,21 @@ public DOMNode updateDOMNode() {
 			addJQueryFocusCallbacks();
 		}
 		populateList();
+		checkEnabled();
+    return domNode;
+	}
+
+	private void checkEnabled() {
 		if (comboBox.isEnabled())
 			domNode.removeAttribute("disabled");
 		else
 			DOMNode.setAttr(domNode, "disabled", "true");			
-    return domNode;
+	}
+
+	
+	@Override
+	public void setEnabled(boolean b) {
+		checkEnabled();
 	}
 
 	@Override
@@ -149,11 +157,11 @@ protected void uninstallListeners() {
 
 	
 	
-	@Override
-	public void propertyChange(PropertyChangeEvent evt) {
-		if (debugging)
-			System.out.println("JSComboBoxUI propertychange " + evt);
-	}
+//	@Override
+//	public void propertyChange(PropertyChangeEvent evt) {
+//		if (debugging)
+//			System.out.println("JSComboBoxUI propertychange " + evt);
+//	}
 	
 	@Override
   public boolean contains(JComponent c, int x, int y) {
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
@@ -295,6 +295,8 @@ public void setDraggable(JSFunction f) {
 	// */
 	// private boolean zeroWidth;
 
+	protected boolean isDummyFrame;
+	
 	/**
 	 * indicates that in a toolbar, this component should use its preferred size for
 	 * min and max
@@ -1190,6 +1192,10 @@ protected DOMNode setHTMLElementCUI() {
 		if (!isTainted)
 			return outerNode;
 
+		if (isDummyFrame) {
+			isTainted = false;
+			return (outerNode = DOMNode.createElement("div", "dummyFrame"));
+		}
 		updateDOMNode();
 		checkTransparent(domNode);
 		Component[] children = getChildren();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -54,8 +54,8 @@ public JSFrameUI() {
 		frameZ += 1000;
 		z = frameZ;
 		isContainer = true;
-		defaultHeight = 500;
-		defaultWidth = 500;
+		defaultHeight = 0;
+		defaultWidth = 0;
 		setDoc();
 	}
 
@@ -76,6 +76,8 @@ public DOMNode updateDOMNode() {
 			// page too much.
 			// a Windows applet has a sort of fuzzy shadowy border
 			domNode = frameNode = newDOMObject("div", id + "_frame");
+			if (isDummyFrame)
+				return domNode;
 			DOMNode.setStyles(frameNode, "box-shadow", "0px 0px 10px gray", "box-sizing", "content-box");
 			setWindowClass();
 			int w = c.getWidth();
@@ -227,7 +229,9 @@ protected void setInnerComponentBounds(int width, int height) {
 	public void installUI(JComponent jc) {
 		super.installUI(jc); 
 		// jc is really JFrame, even though JFrame is not a JComponent
-		frame = (JFrame) c;		
+		frame = (JFrame) c;	
+		isDummyFrame = frame.getClass().getName().equals("javax.swing.SwingUtilities$SharedOwnerFrame");
+		
 		 LookAndFeel.installColors(jc,
 		 "Frame.background",
 		 "Frame.foreground");
@@ -294,7 +298,7 @@ public Rectangle getBoundsPrivate() {
 
 	@Override
 	public Insets getInsets() {
-		return jc.getFrameViewer().getInsets();
+		return (isDummyFrame ? null : jc.getFrameViewer().getInsets());
 	}
 
 	@Override
@@ -311,6 +315,8 @@ public void propertyChange(PropertyChangeEvent e) {
 
 	@Override
 	public void setVisible(boolean b) {
+		if (isDummyFrame)
+			b = false;
 	  super.setVisible(b);
 	  if (isModal) {
 		  if (b) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollPaneUI.java
@@ -192,13 +192,13 @@ static void loadActionMap(LazyActionMap map) {
 
 	@Override
 	public void paint(Graphics g, JComponent c) {
-		checkTextAreaHeight();
-// unnecessary		updateScrollBarExtents();
-		Border vpBorder = scrollpane.getViewportBorder();
-		if (vpBorder != null) {
-			Rectangle r = scrollpane.getViewportBorderBounds();
-			vpBorder.paintBorder(scrollpane, g, r.x, r.y, r.width, r.height);
-		}
+//		checkTextAreaHeight();
+//// unnecessary		updateScrollBarExtents();
+//		Border vpBorder = scrollpane.getViewportBorder();
+//		if (vpBorder != null) {
+//			Rectangle r = scrollpane.getViewportBorderBounds();
+//			vpBorder.paintBorder(scrollpane, g, r.x, r.y, r.width, r.height);
+//		}
 	}
 
 //	private void updateScrollBarExtents() {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java
@@ -27,11 +27,6 @@
 
 package swingjs.plaf;
 
-//import java.awt.Canvas;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
-
-import javajs.api.JSFunction;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -46,13 +41,18 @@
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+//import java.awt.Canvas;
+import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JSplitPane;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
+
+import javajs.api.JSFunction;
 import swingjs.api.js.DOMNode;
 
 /**
@@ -187,7 +187,7 @@ public Dimension getPreferredSize() {
 
 	private Cursor cursor;
 
-	private Object xyev;
+	Object xyev;
 
 	private int pressedLocation;
 
@@ -217,6 +217,7 @@ public Dimension getPreferredSize() {
 	@Override
 	public void installUI(JComponent jc) {
 		splitPane = (JSplitPane) jc;
+		isHorizontal = (splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT);
 		dividerLocationIsSet = false;
 		dividerKeyboardResize = false;
 		keepHidden = false;
@@ -227,33 +228,35 @@ public void installUI(JComponent jc) {
 	}
 
 	protected void fHandleDrag(Object xyev, int type) {
-		isHorizontal = (splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT);
 		getCursor();
-		switch (type) {
-		case MouseEvent.MOUSE_MOVED:
-			divider.setCursor(cursor);
-			break;
-		case MouseEvent.MOUSE_PRESSED:
-			this.xyev = xyev;
-			this.pressedLocation = splitPane.getDividerLocation();
-			divider.setCursor(cursor);
-			DOMNode.setCursor(getCursorName(cursor), null);
-			break;
-		case MouseEvent.MOUSE_DRAGGED:
-			int d = this.pressedLocation + /** @j2sNative (this.isHorizontal ? xyev.dx : xyev.dy) || */ 0;
-			int max = getMaximumDividerLocation(splitPane);
-			int min = getMinimumDividerLocation(splitPane);
-			d = Math.max(min, Math.min(max, d));
-			splitPane.setDividerLocation(d);
-			break;
-		case MouseEvent.MOUSE_RELEASED:
-			DOMNode.setCursor(null, null);
-			divider.setCursor(null);
-			break;
-		}
+		if (splitPane.isEnabled())
+			switch (type) {
+			case MouseEvent.MOUSE_MOVED:
+				divider.setCursor(cursor);
+				return;
+			case MouseEvent.MOUSE_PRESSED:
+				this.xyev = xyev;
+				this.pressedLocation = splitPane.getDividerLocation();
+				divider.setCursor(cursor);
+				DOMNode.setCursor(getCursorName(cursor), null);
+				return;
+			case MouseEvent.MOUSE_DRAGGED:
+				int d = this.pressedLocation + /** @j2sNative (this.isHorizontal ? xyev.dx : xyev.dy) || */
+						0;
+				int max = getMaximumDividerLocation(splitPane);
+				int min = getMinimumDividerLocation(splitPane);
+				d = Math.max(min, Math.min(max, d));
+				splitPane.setDividerLocation(d);
+				return;
+			case MouseEvent.MOUSE_RELEASED:
+				break;
+			}
+		DOMNode.setCursor(null, null);
+		divider.setCursor(null);
 	}	
 	
 	private Cursor getCursor() {
+		isHorizontal = (splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT);
 		if (cursor == null) {
 			cursor = Toolkit.getDefaultToolkit().createCustomCursor(null, null, isHorizontal ? "col-resize" : "row-resize");
 		}
@@ -263,6 +266,7 @@ private Cursor getCursor() {
 	private void setupDivider() {
 		divider = new SplitPaneDivider(this); 
 		JSFunction fDrag = null;
+		@SuppressWarnings("unused")
 		JSSplitPaneUI me = this;
 
 		/**
@@ -2192,4 +2196,10 @@ public void focusLost(FocusEvent ev) {
 	// return new KeyboardResizeToggleHandler();
 	// }
 
+	@Override
+	public void setEnabled(boolean b) {
+		super.setEnabled(b);
+		splitPane.setCursor(b ? getCursor() : null);
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_2.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_2.java
@@ -746,6 +746,9 @@ class Test_2Controls extends JPanel implements ItemListener {
 	private ButtonGroup bg;
 
 	public Test_2Controls(Test_2Canvas canvas) {
+		
+		setBackground(Color.white);
+		
 		setLayout(new FlowLayout()); 
 		// default for JPanel, but 
 		// being explicit allows debugging.
@@ -757,6 +760,7 @@ public Test_2Controls(Test_2Canvas canvas) {
 	  		.getClassLoader()
 	  		.getResource("test/test2.png"), "test");
 	  JLabel l = new JLabel(text, icon, SwingConstants.LEFT);
+	  
 	  add(l);
 		JCheckBox c = new JCheckBox("test");
 		c.addItemListener(this);
@@ -777,6 +781,10 @@ public Test_2Controls(Test_2Canvas canvas) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				enableButtons(enableBtn.getText().equals("Enable"));
+				
+				bg0.setOpaque(false);
+				bg0.setBackground(Color.green);
+
 			}
 
 			private void enableButtons(boolean isEnable) {
@@ -795,6 +803,8 @@ private JComponent addButton(ButtonGroup bg, String text, boolean b) {
 		bg.add(c = new JRadioButton(text, b));
 		c.setName(text);
 		add(c);
+		c.setBackground(Color.blue);
+		System.out.println("radio is opaque " + c.isOpaque());
 		c.setEnabled(false);
 		c.addItemListener(this);
 		c.setFont(new Font("Arial", Font.PLAIN & Font.BOLD, 10));
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Split.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Split.java

Original file line number	Diff line number	Diff line change
`@@ -2884,7 +2884,8 @@ final void updateCursorImmediately() {`
`2884`	`2884`	`// cPeer.updateCursorImmediately();`
`2885`	`2885`	`// }`
`2886`	`2886`	`// } else if (peer != null) {`
`2887`		`- peer.updateCursorImmediately();`
	`2887`	`+ if (peer != null)`
	`2888`	`+ peer.updateCursorImmediately();`
`2888`	`2889`	`// }`
`2889`	`2890`	`}`
`2890`	`2891`
Original file line number	Diff line number	Diff line change
`@@ -1765,7 +1765,7 @@ public static ActionMap getUIActionMap(JComponent component) {`
`1765`	`1765`	`static class SharedOwnerFrame extends JFrame implements WindowListener {`
`1766`	`1766`
`1767`	`1767`	`SharedOwnerFrame() {`
`1768`		`- super(); // required by SwingJS`
	`1768`	`+ super(null, null, null, null); // required by SwingJS`
`1769`	`1769`	`}`
`1770`	`1770`
`1771`	`1771`	`@Override`