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

Timestamp:

05/01/08 17:02:40 (16 years ago)

Author:

ra33

Message:

Added Interactive Widget Items

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (8 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.Font;
@@ -7 +9 @@
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
+import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.image.VolatileImage;
@@ -12 +15 @@
 import java.util.List;
 
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
 import org.expeditee.actions.Misc;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetEdge;
 
 public class FrameGraphics {
@@ -247 +255 @@
                                 paintItems.addAll(toPaint.getItems());
                         }
+                        // FIRST: Paint widgets swing gui (not expeditee gui) .
+                        // Note that these are the ancored widgets
+                        for (InteractiveWidget iw : toPaint.getInteractiveWidgets()) {
+                                iw.paint(bg);
+                        }
+                        
                         PaintPictures(bg, paintItems);
 
@@ -300 +314 @@
                                 PaintLines(bg, Frame.FreeItems);
                         }
+                        
                         if (paintOverlay) {
                                 PaintItem(bg, toPaint.getFrameNameItem());
                         }
+                        
+                        // BROOK: Ensure popups are repainted
+                        if (Browser._theBrowser != null)
+                                repaintPopups(Browser._theBrowser.getLayeredPane(), bg);
+
                         bg.dispose();
                 }
@@ -388 +408 @@
                 g.drawImage(_MessageBuffer, 0, _MaxSize.height, null);
                 g.dispose();
-        }
+                
+        }
+        
+
 
         private static void paintMessage(Graphics2D g, Color background) {
@@ -481 +504 @@
                                         FrameMouseActions.MouseX, FrameMouseActions.MouseY);
 
-                        if (toDisconnect != null) {
-                                if (Frame.itemAttachedToCursor())
+                        // Brook: Widget Edges do not have such a context
+                        if (toDisconnect != null && !(i instanceof WidgetEdge)) {
+                                if(Frame.itemAttachedToCursor())
                                         return;
-
-                                // unhighlight all the other dots
+                                
+                                //unhighlight all the other dots
                                 for (Item conn : toDisconnect.getAllConnected()) {
                                         conn.showHighlight(false);
                                 }
-                                // highlight the dot that will be in disconnect mode
+                                //highlight the dot that will be in disconnect mode
                                 toDisconnect.showDisconnectHighlight(val);
                                 toDisconnect.setFilledHighlight(true);
@@ -724 +748 @@
                 _SupressErrors = val;
         }
+        
+
+        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());
+                                
+                                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);
+                        }
+                }
+        }
 }