Changeset 277

Timestamp:

08/25/08 12:42:23 (16 years ago)

Author:

bjn8

Message:

Simple changes

Location:

trunk/src/org/expeditee

Files:

• gui/PopupManager.java (modified) (3 diffs)
• items/widgets/HeavyDutyInteractiveWidget.java (modified) (7 diffs)
• items/widgets/InteractiveWidget.java (modified) (1 diff)

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

@@ -45 +45 @@
         
         private LinkedList<AnimatedPopup> _animatingPopups = new LinkedList<AnimatedPopup>();
-
         private AnimationThread _animationThread = null;
-        
+
         private final int ANIMATION_DURATION = 180; // Tume its takes for a maximize . minimize to animate. In ms.
         private final int ANIMATION_RATE = 30; // in ms
@@ -87 +86 @@
                 if (c == null) throw new NullPointerException("c");
                 return _invokers.contains(c);
+        }
+        
+        /**
+         * Gets an invoker for a popup
+         * 
+         * @param p
+         *              The popup to get the invoker for.
+         * 
+         * @return
+         *              The invoker for the given popup.
+         *              Null if popup does not exist.
+         */
+        public Component getInvoker(Popup p) {
+                if (p == null) throw new NullPointerException("p");
+                return _popups.get(p);
         }
         
@@ -704 +718 @@
         }
         
+        
         public class ExpandShrinkAnimator implements PopupAnimator {
                 

trunk/src/org/expeditee/items/widgets/HeavyDutyInteractiveWidget.java

@@ -7 +7 @@
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
@@ -13 +14 @@
 import javax.swing.SwingUtilities;
 
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameGraphics;
@@ -230 +232 @@
         private void paintLoadScreen(Graphics g, Color backgroundColor) {
 
+                if (Browser._theBrowser == null) return;
+                
                 // Render shaded window over widget
                 g.setColor(backgroundColor);
@@ -248 +252 @@
                 g.setFont(f);
                 
+                // If need to re-calc the message drawing area... do so
+
                 FontMetrics fm   = g.getFontMetrics(f);
                 Rectangle2D rect = fm.getStringBounds(message, g);
@@ -258 +264 @@
                 if (textY <= 0) textY = barY + 2;
                 textY += textHeight;
-
+                
+                // Ensure that load bar and text doesn't spill over widgets invalidation area
+                Shape clipBackUp = g.getClip();
+                Rectangle tmpClip = (clipBackUp != null) ? clipBackUp.getBounds() : 
+                        new Rectangle(0, 0, 
+                                        Browser._theBrowser.getContentPane().getWidth(), 
+                                        Browser._theBrowser.getContentPane().getHeight());
+                        
+                g.setClip(tmpClip.intersection(getBounds()));
+        
+                
                 if (loadState < 0.0f) { // indeterminant
 
@@ -281 +297 @@
                 else g.setColor(Color.BLACK);
                 
+
+                
                 g.drawString(message, textX, textY);
                 
+                g.setClip(clipBackUp);
+
         }
         
@@ -453 +473 @@
                 }
         }
+        
         
         /**

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

@@ -587 +587 @@
          * @return The expeditee anotation string.
          */
-        private String getAnnotationString() {
+        protected String getAnnotationString() {
 
                 // Create tag and append classname