myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1354440 - in /myfaces/tobago/branches/tobago-1.5.x: ./ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/ tobago-example/tobago-example-test/src/main/webapp/tc/ tobago-example/tobago-example-test/src/main/webapp/tc/tab...
Date Wed, 27 Jun 2012 11:43:07 GMT
Author: lofwyr
Date: Wed Jun 27 11:43:07 2012
New Revision: 1354440

URL: http://svn.apache.org/viewvc?rev=1354440&view=rev
Log:
TOBAGO-1164: Using "auto" layout with tc:tabGroup: The components inside of the tab are displayed
with wrong height 
Merged from trunk [from revision 1354437]

Added:
    myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/tabGroup-layout-1164.xhtml
      - copied unchanged from r1354437, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/tabGroup-layout-1164.xhtml
Modified:
    myfaces/tobago/branches/tobago-1.5.x/   (props changed)
    myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
    myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/
  (props changed)

Propchange: myfaces/tobago/branches/tobago-1.5.x/
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk:r1354437

Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java?rev=1354440&r1=1354439&r2=1354440&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
(original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
Wed Jun 27 11:43:07 2012
@@ -94,19 +94,20 @@ public abstract class AbstractUITabGroup
       LayoutContainer container = getLayoutContainer();
       Measure available = LayoutUtils.getCurrentSize(orientation, container);
       if (available != null) {
-
         for (LayoutComponent component : getLayoutContainer().getComponents()) {
           LayoutUtils.setCurrentSize(orientation, component, available);
-
-          // call sub layout manager
-          if (component instanceof LayoutContainer) {
-            ((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
-          }
         }
       } else {
         LOG.warn("No width/height set but needed for *!"); // todo: more information
       }
     }
+
+    // call sub layout manager
+    for (LayoutComponent component : getLayoutContainer().getComponents()) {
+      if (component instanceof LayoutContainer) {
+        ((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
+      }
+    }
   }
 
   public void postProcessing(Orientation orientation) {

Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc:r1354437



Mime
View raw message