current_7.txt
1 |
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingMouseHandler.java' |
---|---|
2 |
--- src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingMouseHandler.java 2016-03-10 21:10:34 +0000 |
3 |
+++ src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingMouseHandler.java 2016-03-10 23:21:01 +0000 |
4 |
@@ -288,7 +288,7 @@ |
5 |
{ |
6 |
Widget<?> mouseSource = findMouseSource(e); |
7 |
// if the widget has changed, send EXITED/ENTERED events |
8 |
- if (lastHoveredWidget != null && lastHoveredWidget != mouseSource) |
9 |
+ if (lastHoveredWidget != null && !lastHoveredWidget.getActualBounds().contains(e.getX(), e.getY())) |
10 |
{ |
11 |
MouseEvent exite = new MouseEvent((Component) e.getSource(), |
12 |
MouseEvent.MOUSE_EXITED, |
13 |
@@ -303,7 +303,11 @@ |
14 |
processAction(lastHoveredWidget, exite); |
15 |
// call this unconditionally, as the widget needs to be notified that it was exit... |
16 |
tc.postMouseEvent(exite, ews.getWindowId(), UiUtils.getWidgetIdAsInt(lastHoveredWidget)); |
17 |
- |
18 |
+ lastHoveredWidget = null; |
19 |
+ } |
20 |
+ if (lastHoveredWidget != mouseSource |
21 |
+ && mouseSource!= null && mouseSource.getActualBounds().contains(e.getX(), e.getY())) |
22 |
+ { |
23 |
MouseEvent entere = new MouseEvent((Component) e.getSource(), |
24 |
MouseEvent.MOUSE_ENTERED, |
25 |
e.getWhen(), |
26 |
|