Changeset 635

Timestamp:

12/17/13 17:05:46 (11 years ago)

Author:

jts21

Message:

Fix crash (infinite loop) caused by trying to wrap a text item at the edge of the frame when it is too large to wrap

File:

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

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

@@ -1467 +1467 @@
                 
                 _lineBreaker.setPosition(0);
+                boolean requireNextWord = false;
 
                 // --- Get the output of the LineBreakMeasurer and store it in a
                 while (_lineBreaker.getPosition() < _text.length()) {
                         
-                        layout = _lineBreaker.nextLayout(width, _text.length(), true);
+                        if(_autoWrap || ExperimentalFeatures.AutoWrap) {
+                                requireNextWord = width < FrameGraphics.getMaxFrameSize().width - getX();
+                        }
+                        
+                        layout = _lineBreaker.nextLayout(width, _text.length(), requireNextWord);
                         
                         // lineBreaker does not break on newline
@@ -1483 +1488 @@
                                 if (_text.charAt(i) == '\n') {// || c == '\t'){
                                         _lineBreaker.setPosition(start);
-                                        layout = _lineBreaker.nextLayout(width, i, true);
+                                        layout = _lineBreaker.nextLayout(width, i, requireNextWord);
                                         break;
                                 }