Project

General

Profile

3013_1.txt

Sergey Ivanovskiy, 03/03/2016 11:15 AM

Download (1.91 KB)

 
1
=== modified file 'src/com/goldencode/p2j/ui/client/gui/EditorGuiImpl.java'
2
--- src/com/goldencode/p2j/ui/client/gui/EditorGuiImpl.java	2016-02-16 20:45:37 +0000
3
+++ src/com/goldencode/p2j/ui/client/gui/EditorGuiImpl.java	2016-03-03 16:07:52 +0000
4
@@ -1344,10 +1344,14 @@
5
    {
6
       Widget<GuiOutputManager> src = super.findMouseSource(p);
7
       
8
-      return (src == editor || src == contentPane || this == src.parent(EditorGuiImpl.class)) ? 
9
-            this : src;
10
+      // Exclude the mouse source component if it is unregistered ~ it have no id. (editor)
11
+      if (src == null || src.getId() == null)
12
+      {
13
+         return null;
14
+      }
15
+      
16
+      return (src == contentPane) ? this : src;
17
    }
18
-   
19
 
20
    /**
21
     * Get the widget's actual bounds
22

    
23
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/WebMouseHandler.java'
24
--- src/com/goldencode/p2j/ui/client/gui/driver/web/WebMouseHandler.java	2016-01-04 08:14:16 +0000
25
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/WebMouseHandler.java	2016-03-03 04:54:26 +0000
26
@@ -63,7 +63,7 @@
27
             }
28
             else
29
             {
30
-               Widget editor = WidgetRegistry.findAncestor(w, EditorGuiImpl.class);
31
+               Widget editor = WidgetRegistry.findAncestor(target, EditorGuiImpl.class);
32
                if (editor != null && editor.getId() != null)
33
                {
34
                   widgetId = editor.getId().asInt();
35

    
36
=== modified file 'src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java'
37
--- src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java	2016-02-10 19:24:23 +0000
38
+++ src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java	2016-03-03 04:53:51 +0000
39
@@ -361,8 +361,7 @@
40
             continue;
41
          }
42
 
43
-         return (found != null && found.getId() != null) ? found : 
44
-               (w.getId() == null ? null : w); 
45
+         return (found == null) ? w : found;
46
       }
47
 
48
       return null;
49