various fixes for AWT Canvas, Choice, ScrollPane,

hansonr · hansonr · commit fa043ec10366 · 2019-08-28T20:27:21.000-05: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 @@
-20190828094643 
+20190828180221 
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 @@
-20190828094643 
+20190828180221 
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/javax/swing/DefaultComboBoxModel.java b/sources/net.sf.j2s.java.core/src/javax/swing/DefaultComboBoxModel.java
@@ -134,21 +134,27 @@ public int getIndexOf(Object anObject) {
     }
 
     // implements javax.swing.MutableComboBoxModel
-    @Override
+	@Override
 		public void addElement(E anObject) {
         objects.addElement(anObject);
         fireIntervalAdded(this,objects.size()-1, objects.size()-1);
-        if ( objects.size() == 1 && selectedObject == null && anObject != null ) {
+        if (objects.size() == 1 && selectedObject == null && anObject != null ) {
         	秘setSelectedItemQuiet(anObject);
         }
     }
 
     
     // implements javax.swing.MutableComboBoxModel
-    @Override
+    @SuppressWarnings("unused")
+	@Override
 		public void insertElementAt(E anObject,int index) {
         objects.insertElementAt(anObject,index);
         fireIntervalAdded(this, index, index);
+        boolean select = (/**@j2sNative  1 ? !!this.isAWT$ : */false) ;
+        if ( select
+        		
+        		&& index == 0 && objects.size() == 1 && selectedObject == null && anObject != null )
+        	秘setSelectedItemQuiet(anObject);
     }
 
     // implements javax.swing.MutableComboBoxModel
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java
@@ -13,6 +13,7 @@ public Canvas(GraphicsConfiguration config) {
 
 	public Canvas() {
 		super();
+		//no: AWT canvases are not opaque xxxsetBackground(Color.white);
 		秘setPaintsSelf(PAINTS_SELF_ALWAYS);
 		秘paintClass = 秘updateClass = /**@j2sNative C$ || */null;
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java
@@ -19,6 +19,8 @@
  */
 public class PopupMenu extends JPopupMenu implements AWTPopupMenu {
 
+	public void isAWT() {}
+	
 	public PopupMenu() {
 		this(null);
 	}
@@ -30,11 +32,10 @@ public PopupMenu(String string) {
 	@Override
 	public Font getFont() {
 		// AWT default fonts are set by the peer (native OS)
-		Font f = super.getFont();
-		if (f == null) {
-	    	setFont(f = new Font(Font.DIALOG, Font.PLAIN, 12));	    	
-		}
-		return f;
+		if (font == null && parent == null)
+	    	font = new Font(Font.DIALOG, Font.PLAIN, 12);
+		return super.getFont();
+
 	}
 	@Override
 	public int countItems() {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java
@@ -56,13 +56,15 @@ public ScrollPane(int scrollbars) {
 		case SCROLLBARS_AS_NEEDED:
 			break;
 		}
-        setBackground(Color.LIGHT_GRAY); // fills in around the scrollbars
+//        setBackground(Color.LIGHT_GRAY); // fills in around the scrollbars
         setOpaque(true);
 	}
 
 	@Override
 	public Component add(Component c) {
 		getViewport().add(c);
+		if (!isBackgroundSet() && c.isBackgroundSet())
+			setBackground(c.getBackground());
 		return c;
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sComboBox.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sComboBox.js
@@ -16,7 +16,7 @@ $( function() {
     		+'\n.j2scb-unsel {background-color:white;}'
     		+'\n.j2scb-hov {background-color:lightblue;}'
     		+'\n.j2scbcont {position:absolute; left:0px;top:0px;}'
-    		+'\n.j2scbhead {position:absolute; left:0px;top:0px;text-align:left;overflow:hidden;}'
+    		+'\n.j2scbhead {position:absolute; left:0px;top:0px;text-align:left;overflow:hidden;padding:1px}'
     		+'\n.j2scbbtn {position:absolute; leftbackground-color:white;:100px;top:0px; width:20px;text-align:center;cursor:pointer;background-color:lightblue;padding:0px}'
     		+'\n.j2scbpopup {position:absolute; list-style:none}'
     		+'\n.j2scblist {background-color:white;position:absolute; left:0px;top:0px;margin:0;border:black solid 1px;cursor:pointer;text-align:left;padding:0em;scrollbar-width:thin;cursor:pointer;}</style>'
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
@@ -7,6 +7,7 @@
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
+import java.awt.peer.ContainerPeer;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -32,7 +33,7 @@
 import swingjs.api.js.DOMNode;
 
 public class JSScrollPaneUI extends JSLightweightUI implements
-		PropertyChangeListener, ChangeListener {
+		ContainerPeer, PropertyChangeListener, ChangeListener {
 
 	/*
 	 * This first implementation is an attempt to reproduce Java's JScrollPane
@@ -575,7 +576,7 @@ public Insets getInsets() {
 		if (b == null)
 			return null;
 		Insets i = b.getBorderInsets(scrollpane);
-		if (false && !layingOut) {
+		if (isAWT && !layingOut) {
 			// AWT includes scrollbars in visibility, but the layout manager does not
 			i.right += scrollpane.getVerticalScrollBar().isVisible() ? 12 : 0;
 			i.bottom += scrollpane.getHorizontalScrollBar().isVisible() ? 12 : 0;
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
@@ -10,6 +10,7 @@
 //web_Features= graphics, AWT-to-Swing
 
 import java.awt.Adjustable;
+import java.awt.Choice;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Frame;
@@ -28,6 +29,7 @@
 
 import javax.swing.ButtonGroup;
 import javax.swing.JApplet;
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -211,6 +213,10 @@ public void actionPerformed(ActionEvent event) {
 		p.add(button);
 		p.add(button2);
 		p.add(button3);
+	    JComboBox formatChoice = new JComboBox();
+	    formatChoice.insertItemAt("bin\u00e4r", 0);
+	    formatChoice.insertItemAt("hex", 1);
+	    p.add(formatChoice);
 		mkBar(p, tf, Adjustable.HORIZONTAL, 100, 20);
 		JSlider slider = mkSlider(p, tf, Adjustable.HORIZONTAL, 100, 20);
         slider.setPaintTicks(true);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll_AWT.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll_AWT.java
@@ -13,6 +13,7 @@
 
 import java.awt.Adjustable;
 import java.awt.Button;
+import java.awt.Choice;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -323,6 +324,10 @@ public void mouseMoved(MouseEvent e) {
 		p.add(button);
 		p.add(button2);
 		p.add(button3);
+	    Choice formatChoice = new Choice();
+	    formatChoice.insert("bin\u00e4r",0);
+	    formatChoice.insert("hex",1);
+	    p.add(formatChoice);
 		p.setBackground(Color.CYAN);
 		mkBar(p, tf, Adjustable.HORIZONTAL, 100, 40);
 //		Scrollbar framesPerSecond = mkSlider(p, tf, Adjustable.HORIZONTAL, 300, 40);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Editor.java b/sources/net.sf.j2s.java.core/src/test/Test_Editor.java
@@ -137,7 +137,15 @@ public Test_Editor() {
 		js2.setPreferredSize(new Dimension(300, 300));
 		js2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);//_AS_NEEDED);
 		js2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);//NEVER);//VERTICAL_SCROLLBAR_AS_NEEDED);
+		area.addPropertyChangeListener(new PropertyChangeListener() {
 
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				System.out.println("TA property " + evt.getPropertyName());
+				
+			}
+			
+		});
 		JTextField field = getField();
 		JTextField field2 = getField();
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public Canvas(GraphicsConfiguration config) {`
`13`	`13`
`14`	`14`	`public Canvas() {`
`15`	`15`	`super();`
	`16`	`+ //no: AWT canvases are not opaque xxxsetBackground(Color.white);`
`16`	`17`	`秘setPaintsSelf(PAINTS_SELF_ALWAYS);`
`17`	`18`	`秘paintClass = 秘updateClass = /*@j2sNative C$ \|\| /null;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,15 @@ public ScrollPane(int scrollbars) {`
`56`	`56`	`case SCROLLBARS_AS_NEEDED:`
`57`	`57`	`break;`
`58`	`58`	`}`
`59`		`- setBackground(Color.LIGHT_GRAY); // fills in around the scrollbars`
	`59`	`+// setBackground(Color.LIGHT_GRAY); // fills in around the scrollbars`
`60`	`60`	`setOpaque(true);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`public Component add(Component c) {`
`65`	`65`	`getViewport().add(c);`
	`66`	`+ if (!isBackgroundSet() && c.isBackgroundSet())`
	`67`	`+ setBackground(c.getBackground());`
`66`	`68`	`return c;`
`67`	`69`	`}`
`68`	`70`