Changeset 400 for trunk/src/org/expeditee/items/Text.java

Timestamp:

11/18/08 13:34:54 (16 years ago)

Author:

ra33

Message:

Changed the way justification works so that...
Width field has a positive value if explicitly set and under the hood stores a negative value if it has not been set explicitly.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (17 diffs)

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

@@ -47 +47 @@
  */
 public class Text extends Item {
+        private static final int ADJUST_WIDTH_THRESHOLD = 200;
+
         public static String LINE_SEPARATOR = System.getProperty("line.separator");
 
@@ -98 +100 @@
         public static final int PAGE_UP = 8;
 
-        private int _maxWidth = -1;
+        private Integer _maxWidth = null;
 
         private Justification _justification = Justification.left;
@@ -181 +183 @@
          */
         @Override
-        public void setWidth(int width) {
-                invalidateAll();
-                // 0 is the default
-                if (width <= 0) {
-                        width = -1;
+        public void setWidth(Integer width) {
+                invalidateAll();
+
+                if (width == null) {
                         setJustification(Justification.left);
+                        setRightMargin(FrameGraphics.getMaxFrameSize().width, false);
+                        return;
                 }
 
@@ -194 +197 @@
         }
 
+        public Integer getWidthToSave() {
+                return _maxWidth;
+        }
+        
         /**
          * Returns the maximum width of this Text item when justifcation is used.
-         * Note the returned value may be -1, which indicates that there is no
-         * maximum size set
+         * If the width is negative, it means no explicit width has been set
          * 
          * @return The maximum width of this Text item when justification is used
          */
         @Override
-        public int getWidth() {
+        public Integer getWidth() {
+                if (_maxWidth == null || _maxWidth <= 0)
+                        return null;
                 return _maxWidth;
+        }
+
+        public Integer getAbsoluteWidth() {
+                if (_maxWidth == null) {
+                        return Integer.MAX_VALUE;
+                }
+
+                return Math.abs(_maxWidth);
         }
 
@@ -224 +240 @@
 
                 // Only justification left works with 0 width
-                if (just != Justification.left && getWidth() <= 0) {
-                        // TODO Tighten this up so it subtracts the margin widths
-                        setWidth(getBoundsWidth());
-                }
+                // if (just != null && just != Justification.left && !hasWidth()) {
+                // // TODO Tighten this up so it subtracts the margin widths
+                // setWidth(getBoundsWidth());
+                // }
 
                 _justification = just;
@@ -247 +263 @@
 
         private int getJustOffset(TextLayout layout) {
-                if (getWidth() < 0)
-                        return 0;
-
                 if (getJustification() == Justification.center)
-                        return (int) ((getWidth() - layout.getAdvance()) / 2);
+                        return (int) ((getAbsoluteWidth() - layout.getAdvance()) / 2);
                 else if (getJustification() == Justification.right)
-                        return (int) (getWidth() - layout.getAdvance());
+                        return (int) (getAbsoluteWidth() - layout.getAdvance());
 
                 return 0;
@@ -269 +282 @@
                 setText(text, false);
         }
-        
+
         public void setText(String text, Boolean clearCache) {
                 // if (_text != null && text.length() < _text.length())
@@ -279 +292 @@
                  * mode
                  */
-                if(clearCache){
+                if (clearCache) {
                         clearCache();
-                }               
-                        
+                }
+
                 rebuild(true);
                 invalidateAll();
@@ -1314 +1327 @@
                 // If its justification right or center then DONT limit the width
                 if (getJustification() != null) {
-                        maxX = Item.MARGIN_RIGHT + getWidth();
+                        maxX = Item.MARGIN_RIGHT + getAbsoluteWidth();
                 }
 
@@ -1368 +1381 @@
 
                 if (limitWidth) {
-                        if (getWidth() > 0)
-                                width = getWidth();
+                        width = getAbsoluteWidth();
                         // else if (getMaxWidth() > 0)
                         // width = Math.max(50, getMaxWidth() - getX()
@@ -1400 +1412 @@
                         _lineOffsets.add(_lineBreaker.getPosition());
 
-                        if (getWidth() > 0 && getJustification() == Justification.full
+                        if (/* hasWidth() && */getJustification() == Justification.full
                                         && _lineBreaker.getPosition() < _text.length())
                                 layout = layout.getJustifiedLayout(width);
@@ -1409 +1421 @@
                 updatePolygon();
 
+        }
+
+        private boolean hasFixedWidth() {
+                assert (_maxWidth != null);
+                if(_maxWidth == null){
+                        justify(false);
+                }
+                return _maxWidth > 0;
         }
 
@@ -1658 +1678 @@
                 copy.setSpacing(getSpacing());
                 copy.setInitialSpacing(getInitialSpacing());
+
+                copy.setWidth(getWidth());
                 copy.setJustification(getJustification());
                 copy.setLetterSpacing(getLetterSpacing());
@@ -1669 +1691 @@
                 }
                 copy.setHidden(!isVisible());
-                // copy.setWidth(getWidth());
                 return copy;
         }
@@ -1856 +1877 @@
                 setPosition(MARGIN_LEFT, MARGIN_LEFT + getBoundsHeight());
                 Frame modelFrame = getParentOrCurrentFrame();
-                if (modelFrame != null) { 
-                        setRightMargin(modelFrame.getNameItem().getX()
-                                        - MARGIN_LEFT);
+                if (modelFrame != null) {
+                        setRightMargin(modelFrame.getNameItem().getX() - MARGIN_LEFT, true);
                 } else {
-                        System.out.print("Error: text.resetTitlePosition, getParent or currentFrame returned null");
-                        setRightMargin(MARGIN_LEFT);
+                        System.out
+                                        .print("Error: text.resetTitlePosition, getParent or currentFrame returned null");
+                        setRightMargin(MARGIN_LEFT, true);
                 }
         }
@@ -1943 +1964 @@
                 if (isLineEnd())
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+
+                if (!hasFixedWidth()) {
+                        int frameWidth = FrameGraphics.getMaxFrameSize().width;
+                        /*
+                         * Only change width if it is more than 150 pixels from the right of
+                         * the screen
+                         */
+                        if (frameWidth - getX() > ADJUST_WIDTH_THRESHOLD) {
+                                justify(false);
+                                //setRightMargin(frameWidth, false);
+                        }
+                }
+        }
+        
+        public void justify(boolean fixWidth) {
+                Integer width = FrameGraphics.getMaxFrameSize().width;
+
+                // Check if that text item is inside an enclosing rectangle...
+                // Set its max width accordingly
+                Polygon enclosure = FrameUtils.getEnlosingPolygon();
+                if (enclosure != null) {
+                        Rectangle bounds = enclosure.getBounds();
+                        if(bounds.width > 200 && getX() < bounds.width / 3 + bounds.x){
+                                width = bounds.x + bounds.width;
+                        }
+                }
+
+                if (getWidth() == null)
+                        setRightMargin(width, fixWidth);
+
+                // Check for the annotation that restricts the width of text items
+                // on the frame
+                String widthString;
+                if ((widthString = getParentOrCurrentFrame().getAnnotationValue(
+                                "maxwidth")) != null) {
+                        try {
+                                int oldWidth = getWidth();
+                                int maxWidth = Integer.parseInt(widthString);
+                                if (maxWidth < oldWidth)
+                                        setWidth(maxWidth);
+                        } catch (NumberFormatException nfe) {
+                        }
+
+                }
         }
 
@@ -2210 +2275 @@
         public void scale(Float scale, int originX, int originY) {
                 setSize(getSize() * scale);
+
                 setWidth(Math.round(getWidth() * scale));
                 super.scale(scale, originX, originY);