You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/11/21 17:40:08 UTC

svn commit: r1204583 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java

Author: lofwyr
Date: Mon Nov 21 16:40:08 2011
New Revision: 1204583

URL: http://svn.apache.org/viewvc?rev=1204583&view=rev
Log:
TOBAGO-1051: Sheet: layout property columnSeparator to control space between columns.

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1204583&r1=1204582&r2=1204583&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Mon Nov 21 16:40:08 2011
@@ -140,6 +140,8 @@ public abstract class AbstractUISheetLay
           width = width.subtractNotNegative(LayoutUtils.getPaddingBegin(orientation, column));
           width = width.subtractNotNegative(LayoutUtils.getPaddingEnd(orientation, column));
           width = width.subtractNotNegative(LayoutUtils.getBorderEnd(orientation, column));
+          final LayoutComponentRenderer renderer = sheet.getLayoutComponentRenderer(facesContext);
+          width = width.subtractNotNegative(renderer.getCustomMeasure(facesContext, sheet, "columnSeparator"));
           LayoutUtils.setCurrentSize(orientation, component, width);
           component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
           // call sub layout manager