Changeset 163

Timestamp:

07/28/08 15:20:22 (16 years ago)

Author:

ra33

Message:

A couple of fixes to the newly added GetItemsFromChildFrame

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (5 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -157 +157 @@
                 getFromChildFrame(current, false);
         }
-        
+
         public static void GetItemsFromChildFrame(Item current) {
                 getItemsFromChildFrame(current, false);
@@ -189 +189 @@
                 FrameGraphics.Repaint();
         }
-        
+
         private static void getItemsFromChildFrame(Item current, boolean textOnly) {
                 Collection<Item> items = getItemsOnChildFrame(current, textOnly);
@@ -199 +199 @@
                 // copy the item and switch
                 Collection<Item> copies = ItemUtils.CopyItems(items);
-                float deltaX = DisplayIO.getMouseX();
-                float deltaY = FrameMouseActions.getY();
-                for(Item i: copies){
-                        i.setXY(i.getX() + deltaX, i.getY() + deltaY);
+                Item first = items.iterator().next();
+                float deltaX = DisplayIO.getMouseX() - first.getX();
+                float deltaY = FrameMouseActions.getY() - first.getY();
+                for (Item i : copies) {
+                        if (i.isVisible())
+                                i.setXY(i.getX() + deltaX, i.getY() + deltaY);
                         i.setParent(null);
                 }
@@ -681 +683 @@
                 return item;
         }
-        
+
         private static Collection<Item> getItemsOnChildFrame(Item current,
                         boolean textOnly) {
@@ -704 +706 @@
                 else
                         body.addAll(child.getItems());
-                
+
                 return body;
         }