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

Timestamp:

05/31/08 15:31:59 (16 years ago)

Author:

bjn8

Message:

Widgets now are always enclosed fully; fixes 2 minor bugs and improves user interaction...

File:

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

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

@@ -8 +8 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -1183 +1184 @@
                 List<Item> enclosed = getItemsEnclosedBy(DisplayIO.getCurrentFrame(),
                                 firstItem.getEnclosedShape());
+                
+                // Brook: enclosed widgets are to be fully enclosed, never partially
+                List<InteractiveWidget> enclosedWidgets = new LinkedList<InteractiveWidget>();
                 for (Item i : enclosed) {
                         if (!enclosure.contains(i))
                                 i.setSelectedMode(Item.SelectedMode.None);
+                        if (i instanceof WidgetCorner) {
+                                if (!enclosedWidgets.contains(((WidgetCorner)i).getWidgetSource()))
+                                                enclosedWidgets.add(((WidgetCorner)i).getWidgetSource());
+                        }
+                }
+                
+                for (InteractiveWidget iw : enclosedWidgets) {
+                        for (Item i : iw.getItems()) {
+                                if (!enclosed.contains(i)) {
+                                        enclosed.add(i);
+                                }
+                        }
                 }