Skip to content

Commit a309557

Browse files
BobHansonBobHanson
committed
SwingJS-site.zip for // BH 2022.08.27 fix
// BH 2022.08.27 fix frame resize for ChromeBook/Chrome with non-integer event.pageX,pageY
1 parent 37668be commit a309557

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

-3.01 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20220827141103
1+
20220827143544

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip‎

-3.01 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20220827141103
1+
20220827143544

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

-3.01 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
22

3+
// BH 2022.08.27 fix frame resizing for browsers reporting noninteger pageX, pageY
34
// BH 2022.06.23 implements J2S._lastAppletID
45
// BH 2022.01.12 adds pointer option
56
// BH 2021.09.22 default file save as application/octet-stream, not text/plain
@@ -2166,8 +2167,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
21662167
oe.targetTouches && (oe = oe.targetTouches[0]);
21672168
ev.pageX || (ev.pageX = oe ? oe.pageX : J2S._mousePageX);
21682169
ev.pageY || (ev.pageY = oe ? oe.pageY : J2S._mousePageY);
2169-
x = J2S._mousePageX = ev.pageX;
2170-
y = J2S._mousePageY = ev.pageY;
2170+
x = J2S._mousePageX = Math.round(ev.pageX);
2171+
y = J2S._mousePageY = Math.round(ev.pageY);
21712172
return [ Math.round(x - offsets.left), Math.round(y - offsets.top), mods];
21722173
}
21732174

@@ -3117,8 +3118,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
31173118
J2S._dmouseDrag = drag;
31183119

31193120
tag.isDragging = true; // used by J2S mouse event business
3120-
pageX = ev.pageX;
3121-
pageY = ev.pageY;
3121+
pageX = Math.round(ev.pageX);
3122+
pageY = Math.round(ev.pageY);
31223123
var xy = {
31233124
x : 0,
31243125
y : 0,
@@ -3132,8 +3133,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
31323133
var o = $(target(501)).position();
31333134
if (!o) return false;
31343135
xy = {
3135-
x : o.left,
3136-
y : o.top
3136+
x : Math.round(o.left),
3137+
y : Math.round(o.top)
31373138
};
31383139
}
31393140
pageX0 = xy.x;
@@ -3147,8 +3148,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
31473148
tag.isDragging = false;
31483149
var mode = (tag.isDragging ? 506 : 503);
31493150
if (!J2S._dmouseOwner || tag.isDragging && J2S._dmouseOwner == tag) {
3150-
x = pageX0 + (dx = ev.pageX - pageX);
3151-
y = pageY0 + (dy = ev.pageY - pageY);
3151+
x = pageX0 + (dx = Math.round(ev.pageX) - pageX);
3152+
y = pageY0 + (dy = Math.round(ev.pageY) - pageY);
31523153
if (isNaN(x))return;
31533154
if (fDrag) {
31543155
fDrag({

‎sources/net.sf.j2s.java.core/srcjs/swingjs2.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
2+
33
// BH 2022.01.12 adds pointer option see BHTEST
44

55
* jQuery JavaScript Library v1.11.0
@@ -10379,8 +10379,6 @@ return jQuery;
1037910379

1038010380
}));
1038110381
// j2sQueryExt.js]
10382-
10383-
// BH 2022.08.27 fix frame resize for ChromeBook/Chrome with non-integer event.pageX,pageY
1038410382
// BH 2022.01.12 adds pointer option
1038510383
// BH 7/13/2019 removing hook for J2S.unsetMouse
1038610384
// BH 7/21/2016 9:25:38 PM passing .pageX and .pageY to jQuery event
@@ -10688,6 +10686,7 @@ return jQuery;
1068810686
})(jQuery,document,"click mousemove mouseup touchmove touchend", "outjsmol");
1068910687
// j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
1069010688

10689+
// BH 2022.08.27 fix frame resizing for browsers reporting noninteger pageX, pageY
1069110690
// BH 2022.06.23 implements J2S._lastAppletID
1069210691
// BH 2022.01.12 adds pointer option
1069310692
// BH 2021.09.22 default file save as application/octet-stream, not text/plain
@@ -12854,8 +12853,8 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
1285412853
oe.targetTouches && (oe = oe.targetTouches[0]);
1285512854
ev.pageX || (ev.pageX = oe ? oe.pageX : J2S._mousePageX);
1285612855
ev.pageY || (ev.pageY = oe ? oe.pageY : J2S._mousePageY);
12857-
x = J2S._mousePageX = ev.pageX;
12858-
y = J2S._mousePageY = ev.pageY;
12856+
x = J2S._mousePageX = Math.round(ev.pageX);
12857+
y = J2S._mousePageY = Math.round(ev.pageY);
1285912858
return [ Math.round(x - offsets.left), Math.round(y - offsets.top), mods];
1286012859
}
1286112860

0 commit comments

Comments
 (0)