You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/12/02 16:45:12 UTC
svn commit: r886179 - in /incubator/pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
Author: gbrown
Date: Wed Dec 2 15:45:11 2009
New Revision: 886179
URL: http://svn.apache.org/viewvc?rev=886179&view=rev
Log:
Minor fixes to TextAreaSkin and TerraFormSkin.
Modified:
incubator/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
Modified: incubator/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=886179&r1=886178&r2=886179&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ incubator/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Wed Dec 2 15:45:11 2009
@@ -170,7 +170,6 @@
// Determine the label size and baseline
Dimensions labelSize = label.getPreferredSize();
- label.setSize(labelSize);
int labelAscent = label.getBaseline(labelSize.width, labelSize.height);
if (labelAscent == -1) {
labelAscent = labelSize.height;
@@ -187,8 +186,6 @@
fieldSize = field.getPreferredSize();
}
- field.setSize(fieldSize);
-
int fieldAscent = field.getBaseline(fieldSize.width, fieldSize.height);
if (fieldAscent == -1) {
fieldAscent = fieldSize.height;
@@ -277,7 +274,6 @@
// Determine the label size and baseline
Dimensions labelSize = label.getPreferredSize();
- label.setSize(labelSize);
int labelAscent = label.getBaseline(labelSize.width, labelSize.height);
if (labelAscent == -1) {
labelAscent = labelSize.height;
@@ -292,8 +288,6 @@
fieldSize = field.getPreferredSize();
}
- field.setSize(fieldSize);
-
int fieldAscent = field.getBaseline(fieldSize.width, fieldSize.height);
if (fieldAscent == -1) {
fieldAscent = fieldSize.height;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=886179&r1=886178&r2=886179&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Wed Dec 2 15:45:11 2009
@@ -205,7 +205,7 @@
}
public void setBreakWidth(int breakWidth) {
- assert (breakWidth < 0);
+ assert (breakWidth > 0);
int previousBreakWidth = this.breakWidth;