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

Timestamp:

12/12/13 16:43:55 (11 years ago)

Author:

jts21

Message:

Add autowrapping to Text items. Enabled for all items by setting the 'AutoWrap' tag in Settings, or for specific items by setting the 'AutoWrap' property on a Text item.

File:

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

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

@@ -37 +37 @@
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.FreeItems;
 import org.expeditee.math.ExpediteeJEP;
+import org.expeditee.settings.UserSettings;
 import org.nfunk.jep.Node;
 
@@ -122 +124 @@
 
         private int _selectionEnd = -1;
+        
+        // whether autowrap is on/off for this item
+        protected boolean _autoWrap = false;
 
         // text is broken up into lines
@@ -1408 +1413 @@
                 }
 
-                float width = Float.MAX_VALUE;
+                /* float width = Float.MAX_VALUE;
 
                 if (limitWidth) {
@@ -1415 +1420 @@
                         // width = Math.max(50, getMaxWidth() - getX()
                         // - Item.MARGIN_RIGHT);
-                }
+                } */
 
                 _textLayouts.clear();
@@ -1423 +1428 @@
 
                 TextLayout layout;
+                
+                float width;
+                float lineHeight = Float.NaN;
+                List<Point[]> lines = null;
+                
+                if(_autoWrap || UserSettings.AutoWrap) {
+                lines = new LinkedList<Point[]>();
+                if(DisplayIO.getCurrentFrame() == null) {
+                        return;
+                }
+                for(Item item : DisplayIO.getCurrentFrame().getItems()) {
+                                if(item instanceof Line) {
+                                        lines.add(new Point[] { ((Line) item).getStartItem().getPosition(), ((Line) item).getEndItem().getPosition() });
+                                }
+                                if(item instanceof Picture) {
+                                        lines.add(new Point[] { item.getPosition(), new Point(item.getX(), item.getY() + item.getHeight()) });
+                                }
+                }
+                for(Item item : FreeItems.getInstance()) {
+                                if(item instanceof Line) {
+                                        lines.add(new Point[] { ((Line) item).getStartItem().getPosition(), ((Line) item).getEndItem().getPosition() });
+                                }
+                                if(item instanceof Picture) {
+                                        lines.add(new Point[] { item.getPosition(), new Point(item.getX(), item.getY() + item.getHeight()) });
+                                }
+                }
+                width = getLineWidth(getX(), getY(), lines);
+                
+                if(width < 100) {
+                        width = 100;
+                }
+                } else {
+                        width = Float.MAX_VALUE;
+                if (limitWidth) {
+                        width = getAbsoluteWidth();
+                        // else if (getMaxWidth() > 0)
+                        // width = Math.max(50, getMaxWidth() - getX()
+                        // - Item.MARGIN_RIGHT);
+                }
+                }
+                
                 _lineBreaker.setPosition(0);
 
                 // --- Get the output of the LineBreakMeasurer and store it in a
                 while ((layout = _lineBreaker.nextLayout(width)) != null) {
+                        
                         // lineBreaker does not break on newline
                         // characters so they have to be check manually
                         int start = _lineOffsets.get(_lineOffsets.size() - 1);
-
+                        
+                        // int y = getY() + (getLineDrop(layout) * (_lineOffsets.size() - 1) 
+                        
                         // check through the current line for newline characters
                         for (int i = start + 1; i < _text.length(); i++) {
@@ -1447 +1496 @@
 
                         _textLayouts.add(layout);
+                        
+                        if(_autoWrap || UserSettings.AutoWrap) {
+                        if(lineHeight != Float.NaN) {
+                                lineHeight = getLineDrop(layout);
+                        }
+                        width = getLineWidth(getX(), getY() + (lineHeight * (_lineOffsets.size() - 1)), lines);
+                        if(width < 100) {
+                                width = 100;
+                        }
+                        }
                 }
 
                 updatePolygon();
 
+        }
+        
+        private float getLineWidth(int x, float y, List<Point[]> lines) {
+                float width = FrameGraphics.getMaxFrameSize().width;
+                for(Point[] l : lines) {
+                        // check for lines that cross over our y
+                        if((l[0].y >= y && l[1].y <= y) || (l[0].y <= y && l[1].y >= y)) {
+                                float dX = l[0].x - l[1].x;
+                                float dY = l[0].y - l[1].y;
+                                float newWidth;
+                                if(dX == 0) {
+                                        newWidth = l[0].x;
+                                } else if(dY == 0) {
+                                        newWidth = Math.min(l[0].x, l[1].x);
+                                } else {
+                                        // System.out.print("gradient: " + (dY / dX));
+                                        newWidth = l[0].x + (y - l[0].y) * dX / dY;
+                                }
+                                // System.out.println("dY:" + dY + " dX:" + dX + " width:" + newWidth);
+                                if(newWidth < x) {
+                                        continue;
+                                }
+                                if(newWidth < width) {
+                                        width = newWidth;
+                                }
+                        }
+                }
+                return width - x;
         }
 
@@ -1556 +1643 @@
                 if (_text == null || _text.length() == 0)
                         return;
-
-                if (_textLayouts.size() < 1) {
+                
+                if(_autoWrap || UserSettings.AutoWrap) {
+                        invalidateAll();
+                
+                        rebuild(true);
+                } else if (_textLayouts.size() < 1) {
                         rebuild(true);
                         // System.out.println("Error: " + _text);
@@ -2020 +2111 @@
 
         public void justify(boolean fixWidth) {
+                
+                // if autowrap is on, wrapping is done every time we draw
+                if(UserSettings.AutoWrap) {
+                        return;
+                }
+                
                 Integer width = FrameGraphics.getMaxFrameSize().width;
 
@@ -2336 +2433 @@
                 return getText().split("\\s+")[0];
         }
+        
+        public boolean getAutoWrap() {
+                return _autoWrap;
+        }
+        
+        // workaround since true is the default value and would not be displayed normally
+        public String getAutoWrapToSave() {
+                if(!_autoWrap) {
+                        return null;
+                }
+                return "true";
+        }
+        
+        public void setAutoWrap(boolean autoWrap) {
+                _autoWrap = autoWrap;
+        }
 }