AWT dragging outside of applet fails

hansonr · hansonr · commit 425b9dcf6f41 · 2019-07-02T11:10:07.000+02: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 @@
-20190701220956 
+20190702100854 
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 @@
-20190701220956 
+20190702100854 
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/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -4253,7 +4253,9 @@ public void revalidate() {
 		}
 		if (SwingUtilities.isEventDispatchThread()) {
 			invalidate();
-			RepaintManager.currentManager(this).addInvalidComponent(this);
+			// problem here was that AWT labels were automatically resizing when painted
+			if (!秘isAWT())
+				RepaintManager.currentManager(this).addInvalidComponent(this);
 		} else {
 			// getFlag(REVALIDATE_RUNNABLE_SCHEDULED) + " " + this);
 			// To avoid a flood of Runnables when constructing GUIs off
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SEvent.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SEvent.java
@@ -65,6 +65,16 @@ public void run() {
 	  Component target = (Component) this.target;
 	  if (target instanceof A2SContainer) {
 		  Component parent = ((Container)target).getMouseEventTarget(e.x, e.y, true, null, false);
+		  switch (e.id) {
+		  case Event.MOUSE_DRAG:
+		  case Event.MOUSE_UP:
+			  parent = ((A2SContainer) target).getA2SListener().lastTarget;
+			  break;
+		  case Event.MOUSE_DOWN:
+			  ((A2SContainer) target).getA2SListener().lastTarget = parent;
+			  break;
+		  }		  
+//		  System.out.println("A2sevent " + e.id + " " +parent);
 		  // on a focus-out event, e.x or e.y may be negative
 		  if (parent != null)
 			  target = parent;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SListener.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SListener.java
@@ -1,5 +1,6 @@
 package swingjs.a2s;
 
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
@@ -19,6 +20,8 @@
 
 public class A2SListener  implements AdjustmentListener, ActionListener, KeyListener, MouseListener, MouseMotionListener, TextListener, ChangeListener, ItemListener {
 
+	public Component lastTarget;
+
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		new A2SEvent(e).run();
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
@@ -18,6 +18,8 @@
 import java.awt.event.AdjustmentListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.text.DecimalFormat;
@@ -40,7 +42,7 @@
 import javax.swing.plaf.ViewportUI;
 
 @SuppressWarnings("serial")
-public class Test_Applet_Scroll extends JApplet implements ChangeListener {
+public class Test_Applet_Scroll extends JApplet implements ChangeListener, MouseMotionListener {
 
 	static {
 		/**
@@ -83,7 +85,7 @@ public void update(Graphics g) {
 	
 	@Override
 	public void init() {
-
+		
 		final JLabel label = new JLabel("hello");
 		// label.setBounds(0, 60, 200, 60);
 		setSize(label, 80, 50);
@@ -187,6 +189,9 @@ public void actionPerformed(ActionEvent event) {
 		// p.setLayout(new GridLayout(2, 2, 2, 2));
 		JScrollPane sp = new JScrollPane();
 		
+		sp.addMouseMotionListener(this);
+
+
 		panel2 = new JPanel();
 		panel2.add(new JTextArea(10,10));
 		panel2.setSize(100,100);
@@ -299,4 +304,15 @@ public void stateChanged(ChangeEvent e) {
 
 	}
 
+	@Override
+	public void mouseDragged(MouseEvent e) {
+		System.out.println("Test_Applet_Scroll mouseDragged " + e);
+	}
+
+	@Override
+	public void mouseMoved(MouseEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1556,7 +1556,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				,"\n  who:", who.id
 				,"\n  dragging:", J2S._mouseOwner && J2S._mouseOwner.isDragging
 				,"doignore:",doIgnore(ev,1)
-				,"role:",ev.target.getAttribute("role")
+				,"role:",ev.target.getAttribute && ev.target.getAttribute("role")
 				,"data-ui:",ev.target["data-ui"]
 				,"data-component:",ev.target["data-component"]
 				,"mouseOwner:",J2S._mouseOwner && J2S._mouseOwner.id
@@ -1786,7 +1786,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				return true;
 		
 			if (who == J2S._mouseOwner && who.isDragging)
-				return J2S._drag(who, ev, 506);
+				return J2S._drag(who, ev, 503);
 			return true;
 		});
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -12221,7 +12221,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				,"\n  who:", who.id
 				,"\n  dragging:", J2S._mouseOwner && J2S._mouseOwner.isDragging
 				,"doignore:",doIgnore(ev,1)
-				,"role:",ev.target.getAttribute("role")
+				,"role:",ev.target.getAttribute && ev.target.getAttribute("role")
 				,"data-ui:",ev.target["data-ui"]
 				,"data-component:",ev.target["data-component"]
 				,"mouseOwner:",J2S._mouseOwner && J2S._mouseOwner.id
@@ -12451,7 +12451,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				return true;
 		
 			if (who == J2S._mouseOwner && who.isDragging)
-				return J2S._drag(who, ev, 506);
+				return J2S._drag(who, ev, 503);
 			return true;
 		});
 
