You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by no...@apache.org on 2011/04/28 15:29:02 UTC
svn commit: r1097451 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk/skin:
TextAreaSkin.java TextAreaSkinParagraphView.java
Author: noelgrandin
Date: Thu Apr 28 13:29:02 2011
New Revision: 1097451
URL: http://svn.apache.org/viewvc?rev=1097451&view=rev
Log:
PIVOT-735 Strange problem with textarea
The preferred size methods were leaving the breakwidth field in the ParagraphView class in an incorrect state
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=1097451&r1=1097450&r2=1097451&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Thu Apr 28 13:29:02 2011
@@ -279,8 +279,13 @@ public class TextAreaSkin extends Compon
graphics.setFont(font);
graphics.translate(0, margin.top);
+ int breakWidth = (wrapText) ? Math.max(width - (margin.left + margin.right), 0)
+ : Integer.MAX_VALUE;
+
for (int i = 0, n = paragraphViews.getLength(); i < n; i++) {
TextAreaSkinParagraphView paragraphView = paragraphViews.get(i);
+ paragraphView.setBreakWidth(breakWidth);
+ paragraphView.validate();
int x = paragraphView.getX();
graphics.translate(x, 0);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java?rev=1097451&r1=1097450&r2=1097451&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java Thu Apr 28 13:29:02 2011
@@ -33,9 +33,8 @@ import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.TextArea;
-import org.apache.pivot.wtk.Visual;
-class TextAreaSkinParagraphView implements Visual, TextArea.ParagraphListener {
+class TextAreaSkinParagraphView implements TextArea.ParagraphListener {
private static class Row {
public final GlyphVector glyphVector;
public final int offset;
@@ -96,13 +95,11 @@ class TextAreaSkinParagraphView implemen
this.rowOffset = rowOffset;
}
- @Override
public int getWidth() {
validate();
return (int)Math.ceil(width);
}
- @Override
public int getHeight() {
validate();
return (int)Math.ceil(height);
@@ -120,12 +117,6 @@ class TextAreaSkinParagraphView implemen
}
}
- @Override
- public int getBaseline() {
- return -1;
- }
-
- @Override
public void paint(Graphics2D graphics) {
TextArea textArea = (TextArea)textAreaSkin.getComponent();