Changeset 167

Timestamp:

07/28/08 16:52:02 (16 years ago)

Author:

bjn8

Message:

Improvements for widgets and popups

Location:

trunk/src/org/expeditee/gui

Files:

• DisplayIO.java (modified) (3 diffs)
• FrameGraphics.java (modified) (4 diffs)
• FrameMouseActions.java (modified) (2 diffs)

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

@@ -22 +22 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetCacheManager;
 import org.expeditee.stats.SessionStats;
 import org.expeditee.taskmanagement.EntitySaveManager;
@@ -332 +333 @@
 
                 // Remove any popups that are showing on the current frame
-                PopupManager.hideAllPopups();
+                PopupManager.getInstance().hideAllPopups();
 
                 if (_TwinFrames) {
@@ -485 +486 @@
                 }
 
+                // Heavyduty widgets with lots of data may need to unload
+                WidgetCacheManager.onFrameChanged();
+                
                 FrameGraphics.refresh(false);
         }

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

@@ -327 +327 @@
                         // Note that these are the anchored widgets
                         for (InteractiveWidget iw : paintWidgets) {
+                                
                                 if (clip == null
                                                 || clip.intersects(iw.getComponant().getBounds()))
                                         iw.paint(bg);
+                                
+                                // Paint borders
+                                for (Item i : iw.getItems()) {
+                                        if (clip == null
+                                                        || i.isInDrawingArea(clip))
+                                        i.paint(bg);
+                                }
+                                
                         }
 
@@ -448 +457 @@
                         // Repaint popups / drags...
                         if (isActualFrame)
-                                PopupManager.paintLayeredPane(bg, clip);
+                                PopupManager.getInstance().paintLayeredPane(bg, clip);
 
                         bg.dispose();
@@ -824 +833 @@
                                         MessageBay.refresh(true, dg, Item.DEFAULT_BACKGROUND);
                                         return;
-                                }
+                                        
+                                } else return; // nothing to render
                         }
 
@@ -842 +852 @@
                 // Paint frame to window
                 Paint(dg, left, right, Item.DEFAULT_BACKGROUND);
+                
+                // Paint any animations
+                PopupManager.getInstance().paintAnimations();
 
                 // Paint message bay

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

@@ -233 +233 @@
                 // + e.getWhen());
 
-                // Auto-hide popups when user clicks into expeditee world
-                PopupManager.hideAllPopups();
-
                 // TODO WHY DID I NOT COMMENT THIS LINE!! MIKE SAYS
                 if (LastRobotX != null) {
@@ -364 +361 @@
         // This is where all the processing happens
         public void mouseReleased(MouseEvent e) {
+                
                 // System.out.println("Released " + e.getX() + "," + e.getY() + " " +
                 // e.getWhen());
                 FrameUtils.ResponseTimer.restart();
+                
+                // Auto-hide popups when user clicks into expeditee world
+                // If the user clicks into empty space and a popup-is showing, then
+                // the user porbably wants to click away the popup - therefore ignore the event
+                boolean shouldConsume = PopupManager.getInstance().shouldConsumeBackClick();
+                PopupManager.getInstance().hideAllPopups();
+                if (shouldConsume && e.getButton() == MouseEvent.BUTTON1) {
+                        return; // consume back click event
+                }
 
                 // _lastMovedDistance = new Point(e.getX() - _lastMouseClick.getX(), e