Changeset 128

Timestamp:

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

Author:

bjn8

Message:

Fixed popups with widgets. Added custom popup support.

Location:

trunk/src/org/expeditee

Files:

• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameGraphics.java (modified) (6 diffs)
• gui/FrameMouseActions.java (modified) (2 diffs)
• gui/MouseEventRouter.java (modified) (6 diffs)
• gui/Popup.java (added)
• gui/PopupManager.java (added)
• items/InteractiveWidget.java (modified) (2 diffs)
• items/WidgetCorner.java (modified) (2 diffs)

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

@@ -335 +335 @@
                         return;
                 
+                // Remove any popups that are showing on the current frame
+                PopupManager.hideAllPopups();
+                
                 if (_TwinFrames) {
                         if (_CurrentFrames[0] == null) {

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
                 }
 

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

@@ -228 +228 @@
                 // System.out.println("MousePressed " + e.getX() + "," + e.getY() + " "
                 // + e.getWhen());
+                
+                // Auto-hide popups when user clicks into expeditee world
+                PopupManager.hideAllPopups();
 
                 // TODO WHY DID I NOT COMMENT THIS LINE!! MIKE SAYS
@@ -2674 +2677 @@
                 return Math.round(MouseY);
         }
+
+        public static Item getlastHighlightedItem() {
+                return _lastHighlightedItem;
+        }
 }

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

@@ -15 +15 @@
 import javax.swing.SwingUtilities;
 
-import org.expeditee.items.InteractiveWidget;
+import org.expeditee.items.Item;
 
 /**
@@ -65 +65 @@
          */
         private void routeMouseEvent(MouseEvent e) {
-
+                
                 // First convert the point to expeditee space
                 Point containerPoint = SwingUtilities.convertPoint(e.getComponent(), e
@@ -88 +88 @@
                         // whether an expeditee item is currently picked up
                         boolean forwardToExpiditee = false;
+                        boolean isOverPopup = PopupManager.isPointOverPopup(containerPoint);
+                        if (isOverPopup && FreeItems.getInstance().isEmpty()) {
+                                // Popups have highest preference
+                                // forwardToExpiditee = false...
 
                         // Note: all frame.content pane events belong to expeditee
-                        if (e.getSource() == _contentPane
+                        } else if (e.getSource() == _contentPane
                                         || e.getSource() == Browser._theBrowser
-                                        || Frame.itemAttachedToCursor()) {
+                                        || !FreeItems.getInstance().isEmpty()) {
                                 forwardToExpiditee = true;
                         } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
@@ -113 +117 @@
                         if (forwardToExpiditee) {
 
-                                // If forwarding to Expiditee ensure that widgets highlighting
-                                // is enabled
-                                // do give visual feedback yo users such that Expiditee has
-                                // focus.
-                                InteractiveWidget.enableExepiteeHighlighting(true);
-
                                 // Ensure that underlying widgets don't get the event
                                 e.consume();
@@ -175 +173 @@
                                 // highlighted
                                 // to give visual feedback yo users such that swing has focus.
-                                InteractiveWidget.enableExepiteeHighlighting(false);
+                                Item i = FrameMouseActions.getlastHighlightedItem();
+                                if (i != null && i.getHighlightMode() != Item.HighlightMode.None) {
+                                        FrameGraphics.changeHighlightMode(i, Item.HighlightMode.None);
+                                }
 
                                 // Also bring expideditee behaviour to swing: Auto-focus on
@@ -187 +188 @@
                                                 }
                                         }
+                                        // Auto-hide popups when user click on something other other than 
+                                        // a popup - and is not a on a popup invoker
+                                } else if (!isOverPopup && e.getID() == MouseEvent.MOUSE_PRESSED &&
+                                                !PopupManager.isInvoker(e.getComponent())) {
+                                        PopupManager.hideAllPopups();
                                 }
                         }

trunk/src/org/expeditee/items/InteractiveWidget.java

@@ -957 +957 @@
         }
 
-        private static boolean _isExepiteeHighlightingEnabled = true;
-
-        /**
-         * Enables/Disables highlighting of all widgets - if the enable value has
-         * changed the current frame will repaint.
-         * 
-         * The purpose of this is so that widgets can have an extra context: no
-         * expeditee highlighting if focus is on a swing componant.
-         * 
-         * @param enable
-         *            Set to true to enable painting, false to disable painting.
-         */
-        public static void enableExepiteeHighlighting(boolean enable) {
-                if (_isExepiteeHighlightingEnabled != enable) {
-                        _isExepiteeHighlightingEnabled = enable;
-                        FrameGraphics.Repaint();
-                }
-        }
-
-        public static boolean isExpediteeHighlightingEnabled() {
-                return _isExepiteeHighlightingEnabled;
-        }
-
         /**
          * Removes this widget from the parent frame or free space
@@ -1009 +986 @@
         }
         
-        
 }

trunk/src/org/expeditee/items/WidgetCorner.java

@@ -10 +10 @@
         
         private InteractiveWidget _widgetSource;
+        public static final float BORDER_THICKNESS = 2.0f;
 
         WidgetCorner(int x, int y, int id, InteractiveWidget widgetSource) {
                 super(x, y, id);
                 
-                super.setThickness(2.0f);
+                super.setThickness(BORDER_THICKNESS);
                 
                 if (widgetSource == null) throw new NullPointerException("widgetSource");
@@ -65 +66 @@
         @Override
         public void paint(Graphics2D g) {
-                if (InteractiveWidget.isExpediteeHighlightingEnabled()) { // only paint if flag is set to true
-                        
-                        // For fixed widgets, always have corner selected with connected context
-                        HighlightMode tmp = _mode; // save mode
-                        if (_mode == HighlightMode.Normal && _widgetSource.isFixedSize()) {
-                                _mode = HighlightMode.Connected; // draw as connected context for fixed widgets
-                        }
-                        super.paint(g);
-                        _mode = tmp; // restore mode
+                // For fixed widgets, always have corner selected with connected context
+                HighlightMode tmp = _mode; // save mode
+                if (_mode == HighlightMode.Normal && _widgetSource.isFixedSize()) {
+                        _mode = HighlightMode.Connected; // draw as connected context for fixed widgets
                 }
+                super.paint(g);
+                _mode = tmp; // restore mode
         }