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/11/10 17:11:16 UTC
svn commit: r834525 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
Author: tvolkert
Date: Tue Nov 10 16:11:15 2009
New Revision: 834525
URL: http://svn.apache.org/viewvc?rev=834525&view=rev
Log:
Minor fix to baseline alignment in FlowPaneSkin
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java?rev=834525&r1=834524&r2=834525&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java Tue Nov 10 16:11:15 2009
@@ -311,9 +311,16 @@
int y;
if (alignToBaseline
&& baseline != -1) {
- // Align to baseline
- y = baseline - component.getBaseline(component.getWidth(),
+ int componentBaseline = component.getBaseline(component.getWidth(),
component.getHeight());
+
+ if (componentBaseline != -1) {
+ // Align to baseline
+ y = baseline - componentBaseline;
+ } else {
+ // Align to bottom
+ y = rowHeight - component.getHeight();
+ }
} else {
// Align to bottom
y = rowHeight - component.getHeight();