Changeset 145 for trunk/src/org/expeditee/items/Item.java

Timestamp:

07/16/08 18:10:56 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/items/Item.java (modified) (6 diffs)

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

@@ -5 +5 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.Point;
@@ -157 +158 @@
                 dest.setTag(source.getTag());
                 dest.setFillColor(source.getFillColor());
+                dest.setGradientColor(source.getGradientColor());
                 dest.setFillPattern(source.getFillPattern());
 
@@ -254 +256 @@
         // A fill color of null represents transparent
         private Color _colorFill = null;
+
+        // A gradient color of null represents NO gradient
+        private Color _colorGradient = null;
 
         // A fore color of null represents the default color
@@ -946 +951 @@
                         if (isFloating()) {
                                 // TODO experiment with adding alpha when picking up filled
-                                // items...
-                                // Slows things down quite alot!!
+                                // items... Slows things down quite alot!!
                                 fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
                                                 fillColor.getBlue());
                         }
                         g.setColor(fillColor);
-                        // The painting is not efficient enough for gradients...
-                        // Polygon s = getEnclosedShape();
-                        // Rectangle b = s.getBounds();
-                        // GradientPaint gp = new GradientPaint((int) (b.x + b.width * 0.3),
-                        // b.y, getFillColor(), (int) (b.x + b.width * 1.3), b.y,
-                        // Color.white);
-                        // g.setPaint(gp);
-                        // g.fillPolygon(s);
-                        g.fillPolygon(getEnclosedShape());
+                        Color gradientColor = getGradientColor();
+                        if (gradientColor != null) {
+                                // The painting is not efficient enough for gradients...
+                                Polygon s = getEnclosedShape();
+                                Rectangle b = s.getBounds();
+                                GradientPaint gp = new GradientPaint(
+                                                (int) (b.x + b.width * 0.3), b.y, fillColor,
+                                                (int) (b.x + b.width * 1.3), b.y, gradientColor);
+                                g.setPaint(gp);
+                                g.fillPolygon(s);
+                        } else {
+                                g.fillPolygon(getEnclosedShape());
+                        }
                 }
         }
@@ -1234 +1242 @@
                 invalidateCommonTrait(ItemAppearence.FillColor);
                 invalidateFill();
+        }
+
+        public void setGradientColor(Color c) {
+                _colorGradient = c;
+
+                for (Line line : _lines) {
+                        Item other = line.getOppositeEnd(this);
+                        if (other.getGradientColor() != c)
+                                other.setGradientColor(c);
+                }
+
+                invalidateCommonTrait(ItemAppearence.GradientColor);
+                invalidateFill();
+        }
+
+        public Color getGradientColor() {
+                return _colorGradient;
         }
 
@@ -2319 +2344 @@
                 // will ID still
                 // be -1 when saving a frame?
-                //assert (i != null);
+                // assert (i != null);
                 return !isVisible() || getID() < 0 || offScreenTopOrLeft();
         }