Changeset 31

Timestamp:

05/14/08 09:42:21 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/MouseEventRouter.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/MouseEventRouter.java

@@ -16 +16 @@
 
 import org.expeditee.items.InteractiveWidget;
-import org.expeditee.items.Item;
 
 /**
@@ -95 +94 @@
                                         || Frame.itemAttachedToCursor()) {
                                 forwardToExpiditee = true;
+<<<<<<< .mine
+                        } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
+                                                                                                                                // a specific
+                                                                                                                                // expeditee
+                                                                                                                                // item?
+                                // NOTE: Do not use FrameUtils.getCurrentItem() - thats relevent
+                                // for old mouse position only
+                                /*
+                                 * for (Item i : DisplayIO.getCurrentFrame().getItems()) { if
+                                 * (i.getPolygon().contains(containerPoint)) {
+                                 * forwardToExpiditee = true; break; } }
+                                 */// ABOVE: Does not consider overlays
+                                // NOTE: Below is an expensive operation and could be re-used
+                                // when passing mouse events!!!
+                                forwardToExpiditee = (FrameUtils.onItem(DisplayIO
+                                                .getCurrentFrame(), containerPoint.x, containerPoint.y) != null);
+=======
                         } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
                                 // a specific
@@ -107 +123 @@
                                         }
                                 }
+>>>>>>> .r28
                         }
 
@@ -206 +223 @@
                 return false;
         }
+<<<<<<< .mine
+
+=======
+>>>>>>> .r28
 }