You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/10/30 20:25:08 UTC
svn commit: r831429 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra: TerraColorChooserButtonSkin.java TerraListButtonSkin.java TerraPushButtonSkin.java

Author: tvolkert
Date: Fri Oct 30 19:25:07 2009
New Revision: 831429

URL: http://svn.apache.org/viewvc?rev=831429&view=rev
Log:
Fixed some bugs in baseline calculation

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=831429&r1=831428&r2=831429&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Fri Oct 30 19:25:07 2009
@@ -125,7 +125,11 @@
 
         dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
 
-        int baseline = dataRenderer.getBaseline(width) + padding.top + 1;
+        int baseline = dataRenderer.getBaseline(width);
+
+        if (baseline != -1) {
+            baseline += padding.top + 1;
+        }
 
         return baseline;
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=831429&r1=831428&r2=831429&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Fri Oct 30 19:25:07 2009
@@ -205,8 +205,11 @@
 
         dataRenderer.render(listButton.getButtonData(), listButton, false);
 
-        int baseline = dataRenderer.getBaseline(width)
-            + padding.top + 1;
+        int baseline = dataRenderer.getBaseline(width);
+
+        if (baseline != -1) {
+            baseline += padding.top + 1;
+        }
 
         return baseline;
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=831429&r1=831428&r2=831429&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Fri Oct 30 19:25:07 2009
@@ -185,13 +185,17 @@
 
         int preferredHeight1 = dataRenderer.getPreferredHeight(contentWidth) + padding.top
             + padding.bottom + 2;
-        int baseline = dataRenderer.getBaseline(contentWidth) + padding.top + 1;
+        int baseline = dataRenderer.getBaseline(contentWidth);
 
-        // Adjust for preferred aspect ratio
-        if (!Float.isNaN(maximumAspectRatio)
-            && (float) width / (float) preferredHeight1 > maximumAspectRatio) {
-            int preferredHeight2 = (int) (width / maximumAspectRatio);
-            baseline = (int) (preferredHeight1 / (float) preferredHeight2 * baseline);
+        if (baseline != -1) {
+            baseline += padding.top + 1;
+
+            // Adjust for preferred aspect ratio
+            if (!Float.isNaN(maximumAspectRatio)
+                && (float) width / (float) preferredHeight1 > maximumAspectRatio) {
+                int preferredHeight2 = (int) (width / maximumAspectRatio);
+                baseline = (int) (preferredHeight1 / (float) preferredHeight2 * baseline);
+            }
         }
 
         return baseline;