fixes problem with modified mouse-drag

hansonr · hansonr · commit cf8b7f9fc1f8 · 2018-12-20T02:58:04.000-06:00
shift key on mouse drag not recorded in event extended modifiers,
resulting in LightweightDispatcher not considering it a "mouse grab"
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 @@
-20181220001942 
+20181220025341 
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 @@
-20181220001942 
+20181220025341 
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
@@ -2204,8 +2204,10 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
 					"translateY(-" + itop + "%)" + (iscale == null ? "" : iscale));
 		} else {
 			DOMNode.setSize(menuAnchorNode, wCtr + margins.left + margins.right, h);
-			DOMNode.setStyles(textNode, "top", "50%", "transform", "translateY(-80%)");
-			DOMNode.setStyles(iconNode, "top", "50%", "transform", "translateY(-90%) scale(0.6,0.6)");
+			if (actionNode != null) {
+				DOMNode.setStyles(textNode, "top", "50%", "transform", "translateY(-80%)");
+				DOMNode.setStyles(iconNode, "top", "50%", "transform", "translateY(-90%) scale(0.6,0.6)");
+			}
 		}
 	}
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1,5 +1,6 @@
 // j2sCore.js (based on JmolCore.js
 
+// BH 12/20/2018 fixes mouse event extended modifiers for drag operation
 // BH 11/7/2018 adds J2S.addDirectDatabaseCall(domain)
 // BH 9/18/2018 fixes data.getBytes() not qualified
 // BH 8/12/2018 adding J2S.onClazzLoaded(i,msg) hook for customization
@@ -1804,24 +1805,28 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
 
 	var getMouseModifiers = function(ev, id) {
 		// id needed to properly not assign the InputEvent.ButtonX_DOWN_MASK for an UP operation
+		// and also recognize a drag (503 + buttons pressed
 		var modifiers = 0;
-		if (id != 503)
-		switch (ev.button) {
-		default:
-			ev.button = 0;
-			// fall through
-		case 0:
-			modifiers = (1 << 4) | (id ? 0 : (1 << 10));// InputEvent.BUTTON1 +
-												// InputEvent.BUTTON1_DOWN_MASK;
-			break;
-		case 1:
-			modifiers = (1 << 3) | (id ? 0 : (1 << 11));// InputEvent.BUTTON2 +
-												// InputEvent.BUTTON2_DOWN_MASK;
-			break;
-		case 2:
-			modifiers = (1 << 2) | (id ? 0 : (1 << 12));// InputEvent.BUTTON3 +
-												// InputEvent.BUTTON3_DOWN_MASK;
-			break;
+		if (id == 503) {
+			modifiers = ev.buttons << 10;
+		} else {
+			switch (ev.button) {
+			default:
+				ev.button = 0;
+				// fall through
+			case 0:
+				modifiers = (1 << 4) | (id ? 0 : (1 << 10));// InputEvent.BUTTON1 +
+													// InputEvent.BUTTON1_DOWN_MASK;
+				break;
+			case 1:
+				modifiers = (1 << 3) | (id ? 0 : (1 << 11));// InputEvent.BUTTON2 +
+													// InputEvent.BUTTON2_DOWN_MASK;
+				break;
+			case 2:
+				modifiers = (1 << 2) | (id ? 0 : (1 << 12));// InputEvent.BUTTON3 +
+													// InputEvent.BUTTON3_DOWN_MASK;
+				break;
+			}
 		}
 		return modifiers | J2S.getKeyModifiers(ev);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2204,8 +2204,10 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {`
`2204`	`2204`	`"translateY(-" + itop + "%)" + (iscale == null ? "" : iscale));`
`2205`	`2205`	`} else {`
`2206`	`2206`	`DOMNode.setSize(menuAnchorNode, wCtr + margins.left + margins.right, h);`
`2207`		`- DOMNode.setStyles(textNode, "top", "50%", "transform", "translateY(-80%)");`
`2208`		`- DOMNode.setStyles(iconNode, "top", "50%", "transform", "translateY(-90%) scale(0.6,0.6)");`
	`2207`	`+ if (actionNode != null) {`
	`2208`	`+ DOMNode.setStyles(textNode, "top", "50%", "transform", "translateY(-80%)");`
	`2209`	`+ DOMNode.setStyles(iconNode, "top", "50%", "transform", "translateY(-90%) scale(0.6,0.6)");`
	`2210`	`+ }`
`2209`	`2211`	`}`
`2210`	`2212`	`}`
`2211`	`2213`