mouse-up outside application

hansonr · hansonr · commit c6f23d2b748e · 2019-07-13T21:12:42.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollBarUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollBarUI.java
@@ -93,6 +93,7 @@ public Dimension getPreferredSize(JComponent jc) {
 		// thin because we are implementing jquery slider here
 		int wh = (myScrollPaneUI == null ? 15 : myScrollPaneUI.scrollBarUIDisabled ? 0 : 13);
 		// just used for width or height, but not both. I think.... 
+		System.out.println("JSSCrollbarUI dim " + wh + " " + myScrollPaneUI);
 		return new Dimension(wh, wh);
 	}
 	
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
@@ -575,7 +575,7 @@ public Insets getInsets() {
 		if (b == null)
 			return null;
 		Insets i = b.getBorderInsets(scrollpane);
-		if (!layingOut) {
+		if (false && !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
@@ -36,13 +36,10 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JToggleButton;
-import javax.swing.JViewport;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.plaf.ViewportUI;
 
-@SuppressWarnings("serial")
 public class Test_Applet_Scroll extends JApplet implements ChangeListener, MouseListener, MouseMotionListener {
 
 	static {
@@ -58,9 +55,9 @@ public class Test_Applet_Scroll extends JApplet implements ChangeListener, Mouse
 
 	boolean preferred = true;
 
-	private JScrollBar hsb;
-
-	private JScrollBar sbar;
+//	private JScrollBar hsb;
+//
+//	private JScrollBar sbar;
 
 	private JPanel panel2;
 
@@ -202,7 +199,7 @@ public void actionPerformed(ActionEvent event) {
 		sp.getViewport().add(p);
 		getContentPane().add(sp);
 		sp.getViewport().addChangeListener(this);
-		hsb = sp.getHorizontalScrollBar();
+//		hsb = sp.getHorizontalScrollBar();
 
 		sp.getViewport().setBackground(Color.blue);
 		p.setOpaque(false);
@@ -249,7 +246,7 @@ public void mouseWheelMoved(MouseWheelEvent e) {
 		bar.setForeground(Color.green);
 		bar.setOpaque(true);
 		p.add(bar);
-		sbar = bar;
+//		sbar = bar;
 		bar.setVisibleAmount(80);
 		return bar;
 	}
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
@@ -35,8 +35,6 @@
 import java.awt.event.MouseWheelListener;
 import java.text.DecimalFormat;
 
-import javax.swing.JTextArea;
-
 /**
  * Creates a ScrollPane with a mix of SwingJS and AWT components. 
  * 
@@ -304,13 +302,13 @@ public void mouseMoved(MouseEvent e) {
 		// p.setLayout(new GridLayout(2, 2, 2, 2));
 		ScrollPane sp = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
 		sp.add(p);
-		sp.setBackground(Color.yellow);
+		
 
 		sp.setSize(500, 250);
 		
-		Dimension d = sp.getPreferredSize();
 		add(sp);
 
+		setBackground(Color.yellow);
 		mysp = sp;
 		
 		mkSlider(p, tf, Adjustable.VERTICAL, 20, 200);
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -975,7 +975,7 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
 					case "java.io.File":
 						var f = Clazz.new_(Clazz.load("java.io.File").c$$S,
 								[ file.name ]);
-						f.?bytes = J2S._toBytes(data);
+						f.秘bytes = J2S._toBytes(data);
 						return fDone(f);
 					case "ArrayBuffer":
 						break;
@@ -2908,7 +2908,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				}, 502);
 				return false;
 			} else {
-				setTimeout(function(){document.body.dispatchEvent(ev.ev0.originalEvent)},50)
+// if (ev.ev0)
+//				setTimeout(function(){document.body.dispatchEvent(ev.ev0.originalEvent)},50)
 			}
 		};
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public Dimension getPreferredSize(JComponent jc) {`
`93`	`93`	`// thin because we are implementing jquery slider here`
`94`	`94`	`int wh = (myScrollPaneUI == null ? 15 : myScrollPaneUI.scrollBarUIDisabled ? 0 : 13);`
`95`	`95`	`// just used for width or height, but not both. I think....`
	`96`	`+ System.out.println("JSSCrollbarUI dim " + wh + " " + myScrollPaneUI);`
`96`	`97`	`return new Dimension(wh, wh);`
`97`	`98`	`}`
`98`	`99`