You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/11/27 00:07:15 UTC

svn commit: r479449 - /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java

Author: bommel
Date: Sun Nov 26 15:07:15 2006
New Revision: 479449

URL: http://svn.apache.org/viewvc?view=rev&rev=479449
Log:
TOBAGO-163 Calculation of component-height doesn't work correctly if margin is set in gridLayout

Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=479449&r1=479448&r2=479449
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Sun Nov 26 15:07:15 2006
@@ -111,8 +111,8 @@
     int size = Math.min(rows.size(), layoutTokens.length);
 
     int height = 0;
-  //  height += getMarginAsInt(layout.getMarginTop());
-  //  height += getMarginAsInt(layout.getMarginBottom());
+    height += getMarginAsInt(layout.getMarginTop());
+    height += getMarginAsInt(layout.getMarginBottom());
     for (int i = 0; i < size; i++) {
       if (!rowIsRendered(rows.get(i))) {
         continue;