You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/11/30 23:17:39 UTC
svn commit: r1642611 -
/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
Author: weber
Date: Sun Nov 30 22:17:39 2014
New Revision: 1642611
URL: http://svn.apache.org/r1642611
Log:
TOBAGO-1423 - Sheet: forceVerticalScrollbar=true breaks column alignment: fix layout with fixed column sizes < sheet width
[Merged from trunk: revision 1642608]
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1642611&r1=1642610&r2=1642611&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Sun Nov 30 22:17:39 2014
@@ -269,10 +269,16 @@ public abstract class AbstractUISheetLay
parseFixedWidth(layoutInfo, renderedColumns, columnSelectorWidth);
layoutInfo.parseColumnLayout(space.getPixel());
currentWidthList = layoutInfo.getSpaceList();
+
+ int freeWidth = space.getPixel();
+ for (Integer width : currentWidthList) {
+ freeWidth -= width;
+ }
+
if (needVerticalScrollbar) {
- currentWidthList.add(verticalScrollbarWeight.getPixel()); // filler column
+ currentWidthList.add(Math.max(freeWidth, verticalScrollbarWeight.getPixel())); // filler column
} else {
- currentWidthList.add(0); // empty filler column
+ currentWidthList.add(Math.max(freeWidth, 0)); // empty filler column
}
}
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java:r1642608