Changeset 34

Timestamp:

05/14/08 09:54:52 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -9 +9 @@
 import java.awt.Toolkit;
 import java.awt.image.MemoryImageSource;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
@@ -342 +343 @@
                         _CurrentFrames[getCurrentSide()] = frame;
 
-                        // BROOK
+                        // BROOK : TODO...
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                i.onParentFameShown();
+                                i.onParentFameShown(false, 0);
                         }
                 } else {
+
                         // Notifying items on the frame being hidden that they
                         // are about to be hidden.
-                        // ie. Widgets use this method to remove themselves from
-                        // the JPanel
+                        // ie. Widgets use this method to remove themselves from the JPanel
+                        List<Frame> currentOnlyOverlays = new LinkedList<Frame>();
+                        List<Frame> nextOnlyOverlays = new LinkedList<Frame>();
+                        List<Frame> sharedOverlays = new LinkedList<Frame>();
+
+                        // Get all overlayed frames seen by the next frame
+                        for (Overlay o : frame.getOverlaysDeep()) {
+                                if (!nextOnlyOverlays.contains(o))
+                                        nextOnlyOverlays.add(o.Frame);
+                        }
+
+                        // Get all overlayed frames seen by the current frame
                         if (_CurrentFrames[getCurrentSide()] != null) {
-                                for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
+                                for (Overlay o : _CurrentFrames[getCurrentSide()]
+                                                .getOverlaysDeep()) {
+                                        if (!currentOnlyOverlays.contains(o))
+                                                currentOnlyOverlays.add(o.Frame);
+                                }
+                        }
+
+                        // Extract shared overlays between the current and next frame
+                        for (Frame of : currentOnlyOverlays) {
+                                if (nextOnlyOverlays.contains(of)) {
+                                        sharedOverlays.add(of);
+                                }
+                        }
+
+                        // The first set, currentOnlyOverlays, must be notified that they
+                        // are hidden
+                        List<Item> items = new LinkedList<Item>();
+
+                        // Notify items that will not be in view any more
+                        if (_CurrentFrames[getCurrentSide()] != null) {
+                                List<Frame> seen = new LinkedList<Frame>();
+                                seen.addAll(sharedOverlays); // Signify that seen all shared
+                                                                                                // overlays
+                                seen.remove(_CurrentFrames[getCurrentSide()]); // must ensure
+                                                                                                                                // excluded
+
+                                // Get all items seen from the current frame - including all
+                                // possible non-shared overlays
+                                FrameGraphics.AddAllOverlayItems(items,
+                                                _CurrentFrames[getCurrentSide()], seen);
+
+                                // Notify items that they are hidden
+                                for (Item i : items) {
                                         i.onParentFameHidden();
                                 }
                         }
 
+                        // Set the new frame
                         _CurrentFrames[getCurrentSide()] = frame;
                         frame.setMaxSize(FrameGraphics.getMaxFrameSize());
@@ -362 +407 @@
                         // Notify items on the frame being displayed that they are in view
                         // ie. widgets use this method to add themselves to the content pane
-                        for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                i.onParentFameShown();
+                        items.clear();
+
+                        // Get all items seen from the new frame - including all possible
+                        // non-shared overlays
+                        FrameGraphics.AddAllOverlayItems(items,
+                                        _CurrentFrames[getCurrentSide()], new LinkedList<Frame>());
+
+                        // Seperate current frames items from its overlayed items
+                        List<Item> nonOverlayItems = _CurrentFrames[getCurrentSide()]
+                                        .getItems();
+                        items.removeAll(nonOverlayItems);
+
+                        // Notify overlay items that they are shown
+                        for (Item i : items) {
+                                Overlay owner = _CurrentFrames[getCurrentSide()]
+                                                .getOverlayOwner(i);
+                                // if (owner == null) i.onParentFameShown(false, 0);
+                                // else ...
+                                assert (owner != null);
+                                i.onParentFameShown(true, owner.Level);
+                        }
+
+                        // Notify non-overlay items that they are shown
+                        for (Item i : nonOverlayItems) {
+                                i.onParentFameShown(false, 0);
                         }
                 }