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 2007/08/30 07:49:23 UTC

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

Author: bommel
Date: Wed Aug 29 22:49:23 2007
New Revision: 571045

URL: http://svn.apache.org/viewvc?rev=571045&view=rev
Log:
(TOBAGO-473) scrollbars 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?rev=571045&r1=571044&r2=571045&view=diff
==============================================================================
--- 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 Wed Aug 29 22:49:23 2007
@@ -221,6 +221,7 @@
         if (component.isRendered()) {
           return true;
         }
+        // XXX ????
       } else if (UIGridLayout.USED.equals(object)) {
         return true;
       }
@@ -300,14 +301,15 @@
 
             Object object = cells.get(columnIndex);
             if (object.toString().equals(UIGridLayout.USED)) {
+              firstRenderedColum = false;
               continue; // ignore the markers UIGridLayout.Used
-            }
-            if (object.equals(UIGridLayout.FREE)) {
+            } else if (object.equals(UIGridLayout.FREE)) {
               if (LOG.isWarnEnabled() && !layout.isIgnoreFree()) {
                 LOG.warn("There are free blocks in the layout: id='"
                     + layout.getClientId(facesContext)
                     + "'");
               }
+              firstRenderedColum = false;
               continue;
             }
             UIComponent cell = (UIComponent) object;