AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undid my last checkin. I think this one is right: prevent words from

Browse Source 
being broken when our width is not constrained.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@786 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray
2002-06-26 22:04:52 +00:00
parent 256482a739
commit ddf5335776
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/src/java/com/samskivert/swing/Label.java
+19 -8
View File
@@ -1,5 +1,5 @@
// //
// $Id: Label.java,v 1.14 2002/06/26 17:27:51 ray Exp $ // $Id: Label.java,v 1.15 2002/06/26 22:04:52 ray Exp $
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2002 Michael Bayne // Copyright (C) 2002 Michael Bayne
@@ -40,7 +40,6 @@ import java.text.AttributedCharacterIterator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.StringTokenizer;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
@@ -214,7 +213,6 @@ public class Label implements SwingConstants
TextLayout layout = new TextLayout(textIterator(gfx), frc); TextLayout layout = new TextLayout(textIterator(gfx), frc);
Rectangle2D bounds = layout.getBounds(); Rectangle2D bounds = layout.getBounds();
int lines = Math.round(_constraints.height / getHeight(layout)); int lines = Math.round(_constraints.height / getHeight(layout));
lines = Math.min(lines, new StringTokenizer(_text).countTokens());
lines = Math.max(lines, 1); lines = Math.max(lines, 1);
int targetWidth = (int)Math.round(bounds.getWidth() / lines); int targetWidth = (int)Math.round(bounds.getWidth() / lines);
@@ -222,10 +220,11 @@ public class Label implements SwingConstants
// incrementing by 10% each time; limit our attempts to 10 // incrementing by 10% each time; limit our attempts to 10
// expansions to avoid infinite loops if something is fucked // expansions to avoid infinite loops if something is fucked
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
Log.info("trying width " + targetWidth);
LineBreakMeasurer measurer = LineBreakMeasurer measurer =
new LineBreakMeasurer(textIterator(gfx), frc); new LineBreakMeasurer(textIterator(gfx), frc);
layouts = computeLines(measurer, targetWidth, _size); layouts = computeLines(measurer, targetWidth, _size, true);
if (layouts.size() <= lines) { if ((layouts != null) && (layouts.size() <= lines)) {
break; break;
} }
targetWidth = (int)Math.round(targetWidth * 1.1); targetWidth = (int)Math.round(targetWidth * 1.1);
@@ -234,7 +233,7 @@ public class Label implements SwingConstants
} else if (_constraints.width > 0) { } else if (_constraints.width > 0) {
LineBreakMeasurer measurer = LineBreakMeasurer measurer =
new LineBreakMeasurer(textIterator(gfx), frc); new LineBreakMeasurer(textIterator(gfx), frc);
layouts = computeLines(measurer, _constraints.width, _size); layouts = computeLines(measurer, _constraints.width, _size, false);
} else { } else {
// we have no target width, simply lay the text out in one big // we have no target width, simply lay the text out in one big
@@ -270,9 +269,13 @@ public class Label implements SwingConstants
* Computes the lines of text for this label given the specified * Computes the lines of text for this label given the specified
* target width. The overall size of the computed lines is stored into * target width. The overall size of the computed lines is stored into
* the size parameter. * the size parameter.
*
* @return an ArrayList or null if keepWordsWhole was true and
* the lines could not be layed out in the target width.
*/ */
protected ArrayList computeLines ( protected ArrayList computeLines (
LineBreakMeasurer measurer, int targetWidth, Dimension size) LineBreakMeasurer measurer, int targetWidth, Dimension size,
boolean keepWordsWhole)
{ {
// start with a size of zero // start with a size of zero
double width = 0, height = 0; double width = 0, height = 0;
@@ -281,7 +284,10 @@ public class Label implements SwingConstants
// out our text one line at a time // out our text one line at a time
ArrayList layouts = new ArrayList(); ArrayList layouts = new ArrayList();
TextLayout layout; TextLayout layout;
while ((layout = measurer.nextLayout(targetWidth)) != null) { int lastposition = _text.length();
while ((layout = measurer.nextLayout(
targetWidth, lastposition, keepWordsWhole)) != null) {
Rectangle2D bounds = layout.getBounds(); Rectangle2D bounds = layout.getBounds();
width = Math.max(width, bounds.getWidth()); width = Math.max(width, bounds.getWidth());
height += getHeight(layout); height += getHeight(layout);
@@ -292,6 +298,11 @@ public class Label implements SwingConstants
// chokes on setSize(double,double) // chokes on setSize(double,double)
size.setSize(Math.round(width), Math.round(height)); size.setSize(Math.round(width), Math.round(height));
// this can only happen if keepWordsWhole is true
if (measurer.getPosition() < lastposition) {
return null;
}
return layouts; return layouts;
} }