Changeset 128 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

07/04/08 17:30:09 (16 years ago)

Author:

bjn8

Message:

Fixed popups with widgets. Added custom popup support.

File:

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

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

@@ -2 +2 @@
 
 import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -10 +8 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -21 +18 @@
 import java.util.LinkedList;
 import java.util.List;
-
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
 
 import org.expeditee.items.Circle;
@@ -429 +422 @@
                                 PaintNonLinesNonPicture(bg, freeItemsToPaint);
 
-                        // BROOK: Ensure popups are repainted
-                        if (Browser._theBrowser != null)
-                                repaintPopups(Browser._theBrowser.getLayeredPane(), bg);
+                        // Repaint popups / drags...
+                        if (isActualFrame) 
+                                PopupManager.paintLayeredPane(bg, clip);
 
                         bg.dispose();
                 }
 
+                
+                
                 return toPaint.getBuffer();
         }
@@ -698 +693 @@
         }
 
-        private static void repaintPopups(Container parent, Graphics g) {
-                for (Component c : parent.getComponents()) {
-                        if (c instanceof JPopupMenu && ((JPopupMenu) c).isVisible()) {
-                                Point p = SwingUtilities.convertPoint(c, c.getLocation(),
-                                                Browser._theBrowser.getContentPane());
-
-                                c.setIgnoreRepaint(true);
-                                ((JComponent)c).setDoubleBuffered(false);
-                                g.translate(p.x, p.y);
-                                c.paint(g);
-                                g.translate(-p.x, -p.y);
-                        } else if (c instanceof Container
-                                        && c != Browser._theBrowser.getContentPane()) {
-                                repaintPopups((Container) c, g);
-                        }
-                }
-        }
-
+        
         public static int getMode() {
                 return _Mode;
@@ -805 +783 @@
                                 damagedAreas.clear();
                         }
-                        //System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
+                        System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
                 }