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

Timestamp:

07/18/08 14:28:41 (16 years ago)

Author:

ra33

Message:

Added anchorRight and anchorBottom properties to items...
Fixed bugs with @i item display...
Can now inject properties into enclosed items at the same time

File:

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

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

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Cursor;
-import java.awt.Dimension;
 import java.awt.GradientPaint;
 import java.awt.Graphics2D;
@@ -10 +9 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
@@ -167 +167 @@
                 dest.setLinkTemplate(source.getLinkTemplate());
 
-                dest.setMaxSize(source.getMaxSize());
+                // dest.setMaxWidth(source.getMaxWidth());
+
                 dest.setOffset(source.getOffset());
                 dest.setOwner(source.getOwner());
@@ -210 +211 @@
         }
 
+        private Float _anchorRight = null;
+
+        private Float _anchorBottom = null;
+
         protected HighlightMode _mode = HighlightMode.None;
 
@@ -228 +233 @@
         private boolean _highlight = true;
 
-        private Dimension _maxSize = null;
+        // private int _maxWidth = -1;
 
         private String _owner = null;
@@ -719 +724 @@
         }
 
-        public Dimension getMaxSize() {
-                return _maxSize;
-        }
+        // public int getMaxWidth() {
+        // return _maxWidth;
+        // }
 
         public Point getOffset() {
@@ -949 +954 @@
                 Color fillColor = getFillColor();
                 if (fillColor != null && getEnclosingDots() != null) {
-                        if (isFloating()) {
-                                // TODO experiment with adding alpha when picking up filled
-                                // items... Slows things down quite alot!!
-                                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
-                                                fillColor.getBlue());
-                        }
-                        g.setColor(fillColor);
-                        Color gradientColor = getGradientColor();
-                        if (gradientColor != null) {
-                                // The painting is not efficient enough for gradients...
-                                Polygon s = getEnclosedShape();
+                        setFillPaint(g);
+                        g.fillPolygon(getEnclosedShape());
+                }
+        }
+
+        protected void setFillPaint(Graphics2D g) {
+                Color fillColor = getFillColor();
+                if (isFloating()) {
+                        // TODO experiment with adding alpha when picking up filled
+                        // items... Slows things down quite alot!!
+                        fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
+                                        fillColor.getBlue());
+                }
+                g.setColor(fillColor);
+                Color gradientColor = getGradientColor();
+                if (gradientColor != null) {
+                        // The painting is not efficient enough for gradients...
+                        Shape s = getEnclosedShape();
+                        if (s != null) {
                                 Rectangle b = s.getBounds();
                                 GradientPaint gp = new GradientPaint(
@@ -965 +978 @@
                                                 (int) (b.x + b.width * 1.3), b.y, gradientColor);
                                 g.setPaint(gp);
-                                g.fillPolygon(s);
-                        } else {
-                                g.fillPolygon(getEnclosedShape());
                         }
                 }
@@ -1364 +1374 @@
         }
 
-        /**
-         * Sets the maximum coordinates on the screen that this item may occupy.
-         * This is used by Text items to compute word-wrapping lengths.
-         * 
-         * @param d
-         *            The Maximum size of the Frame containing this Item.
-         */
-        public void setMaxSize(Dimension d) {
-                if (d != null) {
-                        _maxSize = d;
-                        updatePolygon();
-                }
-        }
+        // /**
+        // * Sets the maximum coordinates on the screen that this item may occupy.
+        // * This is used by Text items to compute word-wrapping lengths.
+        // *
+        // * @param d
+        // * The Maximum size of the Frame containing this Item.
+        // */
+        // public void setMaxWidth(int width) {
+        // if (width > 0) {
+        // _maxWidth = width;
+        // updatePolygon();
+        // }
+        // }
 
         public void setOffset(int x, int y) {
@@ -2347 +2357 @@
                 return !isVisible() || getID() < 0 || offScreenTopOrLeft();
         }
+
+        public void setAnchorRight(Float anchor) {
+                this._anchorRight = anchor;
+                if (anchor != null)
+                        setX(FrameGraphics.getMaxFrameSize().width - anchor);
+        }
+
+        public Float getAnchorRight() {
+                return _anchorRight;
+        }
+
+        public void setAnchorBottom(Float anchor) {
+                this._anchorBottom = anchor;
+                if (anchor != null)
+                        setY(FrameGraphics.getMaxFrameSize().height - anchor);
+        }
+
+        public Float getAnchorBottom() {
+                return _anchorBottom;
+        }
 }