Skip to content

Commit 2b944a7

Browse files
committed
JSMouse retargetMouseEvent check for null component
1 parent 9be3101 commit 2b944a7

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed
3 Bytes
Binary file not shown.

sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,25 +585,26 @@ public static void retargetMouseEvent(Object jqevent, DOMNode base, JComponent f
585585
if (id == 0)
586586
id = fixEventType(jqevent, 0);
587587
boolean isDirect = (base != null);
588-
JSComponent c;
588+
JSComponent c = null;
589589
if (base == null) {
590590
c = JSComponent.秘getTopInvokableAncestor(from, false);
591+
if (c == null)
592+
c = from;
591593
base = c.秘getUI().getDOMNode();
592594
} else {
593595
c = from;
594596
}
595597
int[] xym = null;
596598
/**
597-
* @j2sNative jqevent.j2sretarget = to;
598-
* xym = J2S._getEventXY(jqevent, J2S.$(base).offset());
599+
* @j2sNative jqevent.j2sretarget = to; xym = J2S._getEventXY(jqevent,
600+
* J2S.$(base).offset());
599601
*/
600602
int modifiers = getModifiers(jqevent);
601603
long time = System.currentTimeMillis();
602604
if (isDirect) {
603605
processMouseEvent(jqevent, from, id, time, xym[0], xym[1], 0, modifiers, 0);
604606
} else {
605-
c.getFrameViewer().processMouseEvent(id, xym[0], xym[1], modifiers, time, jqevent,
606-
getScroll(jqevent));
607+
c.getFrameViewer().processMouseEvent(id, xym[0], xym[1], modifiers, time, jqevent, getScroll(jqevent));
607608
}
608609
}
609610

0 commit comments

Comments
 (0)