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

Timestamp:

12/12/13 17:15:00 (11 years ago)

Author:

jts21

Message:

Text wrapping now only wraps around whitespace/special characters, when there isn't enough space to display a word it just drops down to the next line

File:

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

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

@@ -135 +135 @@
         private List<Integer> _lineOffsets = new LinkedList<Integer>();
 
+        private FontRenderContext frc = null;
         private LineBreakMeasurer _lineBreaker = null;
 
@@ -1409 +1410 @@
                                         .toString());
                         paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
-                        _lineBreaker = new LineBreakMeasurer(paragraphText.getIterator(),
-                                        new FontRenderContext(null, true, true));
+                        frc = new FontRenderContext(null, true, true);
+                        _lineBreaker = new LineBreakMeasurer(paragraphText.getIterator(), frc);
                 }
 
@@ -1455 +1456 @@
                 }
                 width = getLineWidth(getX(), getY(), lines);
-                
-                if(width < 100) {
-                        width = 100;
-                }
                 } else {
                         width = Float.MAX_VALUE;
@@ -1472 +1469 @@
 
                 // --- Get the output of the LineBreakMeasurer and store it in a
-                while ((layout = _lineBreaker.nextLayout(width)) != null) {
+                while (_lineBreaker.getPosition() < _text.length()) {
+                        
+                        layout = _lineBreaker.nextLayout(width, _text.length(), true);
                         
                         // lineBreaker does not break on newline
@@ -1484 +1483 @@
                                 if (_text.charAt(i) == '\n') {// || c == '\t'){
                                         _lineBreaker.setPosition(start);
-                                        layout = _lineBreaker.nextLayout(width, i, false);
+                                        layout = _lineBreaker.nextLayout(width, i, true);
                                         break;
                                 }
@@ -1490 +1489 @@
 
                         _lineOffsets.add(_lineBreaker.getPosition());
+                        
+                        if(layout == null) {
+                                layout = new TextLayout(" ", getPaintFont(), frc);
+                        }
 
                         if (/* hasWidth() && */getJustification() == Justification.full
                                         && _lineBreaker.getPosition() < _text.length())
                                 layout = layout.getJustifiedLayout(width);
-
+                        
                         _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;
-                        }
+                        width = getLineWidth(getX(), getY() + (lineHeight * (_textLayouts.size() - 1)), lines);
                         }
                 }