Changeset 997 for trunk/src/org/expeditee/gui/FrameUtils.java

Timestamp:

02/05/16 09:33:19 (8 years ago)

Author:

davidb

Message:

Added new version of FrameIO

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (3 diffs)

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

@@ -59 +59 @@
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.widgets.ButtonWidget;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
+import org.expeditee.items.widgets.RubbishBin;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -1222 +1224 @@
             checkList.addAll(toCheck.getInteractableItems());
             checkList.add(toCheck.getNameItem());
+            
             for (Item i : checkList) {
+                        
                 // do not check annotation items in audience mode
                 if (i.isVisible()
                         && !(FrameGraphics.isAudienceMode() && i.isAnnotation())) {
-                    if (i.contains(x, y)
-                            && !FreeItems.getInstance().contains(i)) {
-                        possibles.add(i);
+                        if(i instanceof WidgetCorner){
+                                WidgetCorner wc = (WidgetCorner)i;
+                                if(wc.getWidgetSource() instanceof ButtonWidget){
+                                        ButtonWidget bw = (ButtonWidget) wc.getWidgetSource();
+                                        
+                                        if(bw.getdropInteractableStatus() == true){
+                                                InteractiveWidget iw = wc.getWidgetSource();
+                                                
+                                                if(iw.getBounds().contains(x, y)){
+                                                        
+                                                        if( !FreeItems.getInstance().contains(i))
+                                                {
+                                                                possibles.add(i);                                                       
+                                                }
+                                                }       
+                                        }
+                                        
+                                }
+                                
+                }
+
+                    if (i.contains(x, y)){
+                        if( !FreeItems.getInstance().contains(i))
+                        {
+                                possibles.add(i);                               
+                        }
                     }
+                           
                 }
             }
@@ -1263 +1291 @@
             }
 
-        }
+        }       
 
         return closest;