Version 0.6.156, add X.UI.Repeater.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 11_VBox.js

diff --git a/0.6.x/js/20_ui/11_VBox.js b/0.6.x/js/20_ui/11_VBox.js
index 9c81e5a..f11c592 100644 (file)
--- a/0.6.x/js/20_ui/11_VBox.js
+++ b/0.6.x/js/20_ui/11_VBox.js
@@ -39,9 +39,9 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
                autoW          = contentW === XUI_Attr_AUTO;\r
                autoH          = contentH === XUI_Attr_AUTO;\r
                detectionPhase = autoW || autoH;\r
-               gapY           = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.gapY.No ], contentH );\r
-               childW         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW );\r
-               childH         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH );\r
+               gapY           = XUI_AbstractUINode_calcValue( attrs[ data.usableAttrs.gapY.No ], contentH );\r
+               childW         = XUI_AbstractUINode_calcValue( attrs[ data.usableAttrs.childWidth.No ], contentW );\r
+               childH         = XUI_AbstractUINode_calcValue( attrs[ data.usableAttrs.childHeight.No ], contentH );\r
                _x             = data.contentL;\r
                _y             = 0; //data.contentT;\r
 \r
@@ -54,13 +54,13 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
                                node.calculate( detectionPhase, 0, _y, contentW, childH );\r
                                _y += node.boxHeight + gapY;\r
                                //console.dir( node );\r
-                               // 概算のみ\r
+                               // 概算のみ, 子要素の最大幅を調べる _w\r
                                if( autoW ){\r
                                        if( node.boxWidth !== XUI_Attr_AUTO ){\r
                                                w = node.boxWidth;\r
                                        } else\r
-                                       if( node.minBoxWidth !== XUI_Attr_AUTO ){\r
-                                               w = node.minBoxWidth;\r
+                                       if( node.boxWidthMin !== XUI_Attr_AUTO ){\r
+                                               w = node.boxWidthMin;\r
                                                minFlag = true;\r
                                        } else {\r
                                                w = 0;\r
@@ -70,7 +70,7 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
                        };\r
                        _y -= gapY;\r
                } else {\r
-                       _y = data.minContentHeight !== XUI_Attr_AUTO ? data.minContentHeight : 0;\r
+                       _y = data.contentHeightMin !== XUI_Attr_AUTO ? data.contentHeightMin : 0;\r
                };\r
 \r
                if( detectionPhase ){\r
@@ -103,12 +103,12 @@ X.UI.VBox = X.UI.Box.inherits(
                        var supports;\r
                        \r
                        if( !XUI_VBox ){\r
-                               supports = XUI_Attr_createAttrDef( XUI_Box.prototype.supportAttrs, XUI_Layout_Vertical.overrideAttrsForSelf );\r
+                               supports = XUI_Attr_createAttrDef( XUI_Box.prototype.usableAttrs, XUI_Layout_Vertical.overrideAttrsForSelf );\r
                                \r
                                XUI_VBox = XUI_Box.inherits(\r
                                                        {\r
                                                                layout       : XUI_Layout_Vertical,\r
-                                                               supportAttrs : supports,\r
+                                                               usableAttrs : supports,\r
                                                                attrClass    : XUI_Attr_preset( XUI_Box.prototype.attrClass, supports, {\r
                                                                                gapY       : '0.2em',\r
                                                                                childWidth : '100%'\r