Changeset 283

Timestamp:

08/27/08 14:13:27 (16 years ago)

Author:

bjn8

Message:

Popups can change border size and color

Location:

trunk/src/org/expeditee/gui

Files:

• Popup.java (modified) (7 diffs)
• PopupManager.java (modified) (6 diffs)

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

@@ -2 +2 @@
 
 import java.awt.BasicStroke;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -11 +12 @@
 import javax.swing.JPanel;
 
+import org.expeditee.items.ItemUtils;
+
 /**
  * 
@@ -29 +32 @@
         private static final BasicStroke DEFAULT_STROKE = new BasicStroke(2.0f);
         
-        private BasicStroke _lineStroke = DEFAULT_STROKE;
+        private BasicStroke _borderStroke = DEFAULT_STROKE;
+        private Color _borderColor = Color.BLACK;
         
         private boolean _isReadyToPaint = false;
@@ -59 +63 @@
                 super.paint(g);
                 
-                if (_lineStroke != null) {
-                        // Draw iwidget-like border for consistancy
-                        ((Graphics2D)g).setStroke(_lineStroke);
+                // Draw border - if not transparent
+                if (_borderStroke != null && _borderColor != null) {
+                        g.setColor(_borderColor);
+                        ((Graphics2D)g).setStroke(_borderStroke);
                         g.drawRect(0, 0, getWidth(), getHeight());
                 }
@@ -149 +154 @@
         
         /**
+         * Invalidates self.
          * 
          * @param thickness
@@ -156 +162 @@
                 assert(thickness >= 0);
                 
-                if (thickness == 0) _lineStroke = null;
-                else _lineStroke = new BasicStroke(thickness);
+                if (_borderStroke != null && _borderStroke.getLineWidth() == thickness)
+                        return;
+                
+                boolean posInvalidate = true;
+                
+                if (thickness < _borderStroke.getLineWidth()) {
+                        invalidateAppearance();
+                        posInvalidate = false;
+                }
+                
+                if (thickness == 0) _borderStroke = null;
+                else _borderStroke = new BasicStroke(thickness);
+                
+                if (posInvalidate) invalidateAppearance();
 
         }
@@ -166 +184 @@
          */
         public float getBorderThickness() {
-                if (_lineStroke == null) return 0.0f;
-                return _lineStroke.getLineWidth();
-        }
-        
+                if (_borderStroke == null) return 0.0f;
+                return _borderStroke.getLineWidth();
+
+        }
+        
+        /**
+         * Sets the border color around the popup.
+         * Invalidates self.
+         * 
+         * @param c
+         *              The new color. Null for transparent.
+         */
+        public void setBorderColor(Color c) {
+                
+                if (c == null && _borderColor != null) 
+                        invalidateAppearance();
+                
+                if (c != _borderColor) {
+                        _borderColor = c;
+                        invalidateAppearance();
+                }
+        }
+        
+        /**
+         * 
+         * @return
+         *              The border color for the popup. NUll if transparent
+         */
+        public Color getBorderColor() {
+                return _borderColor;
+        }
+        
+        /**
+         * Invalidates the whole popup so that it must be fully repainted.
+         */
+        public void invalidateAppearance() {
+                
+                if (_borderColor != null && _borderStroke != null && _borderStroke.getLineWidth() > 0) { // border
+                        FrameGraphics.invalidateArea(ItemUtils.expandRectangle(getBounds(), 
+                                        (int)Math.ceil(getBorderThickness()) + 1));
+                } else { // no border
+                        FrameGraphics.invalidateArea(getBounds());
+                }
+
+        }
+        
+
         
 }

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

@@ -17 +17 @@
 import javax.swing.SwingUtilities;
 
-import org.expeditee.items.ItemUtils;
-
 /**
  * A centralized container for all custom popups in expeditee.
@@ -173 +171 @@
                                 invokersToClear.add(_popups.get(p));
                                 
-                                invalidatePopup(p);
+                                p.invalidateAppearance();
                                 p.setVisible(false);
                                 Browser._theBrowser.getLayeredPane().remove(p);
@@ -243 +241 @@
                 }
 
-                invalidatePopup(p);
+                p.invalidateAppearance();
                 p.setVisible(false);
                 Browser._theBrowser.getLayeredPane().remove(p);
@@ -331 +329 @@
                 // Invalidate the popup border
                 if (p.getBorderThickness() > 0.0f) {
-                        invalidatePopup(p);
+                        p.invalidateAppearance();
                 }
         }
@@ -480 +478 @@
                         
                 }
-        }
-        
-        
-        private void invalidatePopup(Popup p) {
-                FrameGraphics.invalidateArea(ItemUtils.expandRectangle(p.getBounds(), 
-                                (int)Math.ceil(p.getBorderThickness())));
         }
         
@@ -621 +613 @@
                                                 // Invalidate the popup border
                                                 if (ap.popup.getBorderThickness() > 0.0f) {
-                                                        invalidatePopup(ap.popup);
+                                                        ap.popup.invalidateAppearance();
                                                 }
                                         }