Changeset 215

Timestamp:

08/11/08 18:47:14 (16 years ago)

Author:

bjn8

Message:

Fixed borders

Location:

trunk/src/org/expeditee/gui

Files:

• Popup.java (modified) (4 diffs)
• PopupManager.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.BasicStroke;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.LayoutManager;
 
@@ -23 +25 @@
         
         //Mike says: Can we get the border for the IW to which this popup corresponds?
-        public static final float BORDER_THICKNESS = 1.0F;
-//      private static final Stroke _lineStroke = new BasicStroke(BORDER_THICKNESS);
+        // Brook says: Would be nice - but popups are actually independant from widgets
+        //   =>Now: It is up to the user of the popup to set the border thickness
+        private static final BasicStroke DEFAULT_STROKE = new BasicStroke(2.0f);
+        
+        private BasicStroke _lineStroke = DEFAULT_STROKE;
         
         private boolean _isReadyToPaint = false;
@@ -53 +58 @@
         public void paint(Graphics g) {
                 super.paint(g);
-                // Draw iwidget-like border for consistancy
-//              ((Graphics2D)g).setStroke(_lineStroke);
-//              g.drawRect(0, 0, getWidth(), getHeight());
+                
+                if (_lineStroke != null) {
+                        // Draw iwidget-like border for consistancy
+                        ((Graphics2D)g).setStroke(_lineStroke);
+                        g.drawRect(0, 0, getWidth(), getHeight());
+                }
         }
         
@@ -140 +148 @@
         }
         
+        /**
+         * 
+         * @param thickness
+         *              The new thickness to set. Null for no border.
+         */
+        public void setBorderThickness(float thickness) {
+                assert(thickness >= 0);
+                
+                if (thickness == 0) _lineStroke = null;
+                else _lineStroke = new BasicStroke(thickness);
+
+        }
         
-        
+        /**
+         * @return
+         *              The border thickness of this popup. Zero or more.
+         */
+        public float getBorderThickness() {
+                if (_lineStroke == null) return 0.0f;
+                return _lineStroke.getLineWidth();
+        }
         
         

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

@@ -309 +309 @@
                 
                 // Invalidate the popup border
-                if (Popup.BORDER_THICKNESS > 0) {
+                if (p.getBorderThickness() > 0.0f) {
                         invalidatePopup(p);
                 }
@@ -464 +464 @@
         private void invalidatePopup(Popup p) {
                 FrameGraphics.invalidateArea(ItemUtils.expandRectangle(p.getBounds(), 
-                                (int)Math.ceil(Popup.BORDER_THICKNESS)));
+                                (int)Math.ceil(p.getBorderThickness())));
         }
         
@@ -599 +599 @@
                                                 
                                                 // Invalidate the popup border
-                                                if (Popup.BORDER_THICKNESS > 0) {
+                                                if (ap.popup.getBorderThickness() > 0.0f) {
                                                         invalidatePopup(ap.popup);
                                                 }