Changeset 32

Timestamp:

05/14/08 09:43:27 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -198 +198 @@
         }
 
-        private static void AddAllOverlayItems(List<Item> items, Frame overlay,
+        public static void AddAllOverlayItems(List<Item> items, Frame overlay,
                         List<Frame> seenOverlays) {
                 if (seenOverlays.contains(overlay))
@@ -209 +209 @@
 
                 items.addAll(overlay.getItems());
+        }
+
+        /**
+         * Recursive function similar to AddAllOverlayItems.
+         * 
+         * @param widgets
+         *            The collection the widgets will be added to
+         * @param overlay
+         *            An "overlay" frame - this intially will be the parent frame
+         * @param seenOverlays
+         *            Used for state in the recursion stack. Pass as an empty
+         *            (non-null) list.
+         */
+        public static void AddAllOverlayWidgets(List<InteractiveWidget> widgets,
+                        Frame overlay, List<Frame> seenOverlays) {
+                if (seenOverlays.contains(overlay))
+                        return;
+
+                seenOverlays.add(overlay);
+
+                for (Overlay o : overlay.getOverlays())
+                        AddAllOverlayWidgets(widgets, o.Frame, seenOverlays);
+
+                widgets.addAll(overlay.getInteractiveWidgets());
         }
 
@@ -244 +268 @@
 
                         List<Item> paintItems = new LinkedList<Item>();
-                        List<Frame> seenOverlays = new LinkedList<Frame>();
-                        if (paintOverlay)
-                                AddAllOverlayItems(paintItems, toPaint, seenOverlays);
-                        else {
+                        List<InteractiveWidget> paintWidgets;
+
+                        if (paintOverlay) {
+
+                                AddAllOverlayItems(paintItems, toPaint, new LinkedList<Frame>());
+
+                                paintWidgets = new LinkedList<InteractiveWidget>();
+                                AddAllOverlayWidgets(paintWidgets, toPaint,
+                                                new LinkedList<Frame>());
+
+                        } else {
                                 paintItems.addAll(toPaint.getItems());
-                        }
+                                paintWidgets = toPaint.getInteractiveWidgets();
+                        }
+
                         // FIRST: Paint widgets swing gui (not expeditee gui) .
                         // Note that these are the ancored widgets
-                        for (InteractiveWidget iw : toPaint.getInteractiveWidgets()) {
+                        for (InteractiveWidget iw : paintWidgets) {
                                 iw.paint(bg);
                         }
@@ -535 +568 @@
                 Repaint();
         }
+        
+        public static void ChangeSelectionMode(Item item, Item.SelectedMode newMode) {
+                if (item == null)
+                        return;
+                
+                for(Item i: item.getAllConnected())
+                        i.setSelectedMode(newMode);
+                Repaint();
+        }
 
         public static void OverwriteMessage(String message) {