Version 0.6.141, fix X.UI.ScrollBox.

[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 00b706a..d9becca 100644 (file)
--- a/0.6.x/js/20_ui/11_VBox.js
+++ b/0.6.x/js/20_ui/11_VBox.js
@@ -1,15 +1,15 @@
-X.UI.Layout.Vertical = X.UI.Layout.create( {\r
+var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout( {\r
        \r
        name : 'VerticalLayout',\r
        \r
        overrideAttrsForSelf : {\r
                selectable  : false,\r
-               role        : [ 0,              X.UI.Dirty.CLEAN,  X.UI.Attr.USER.UINODE, X.UI.Attr.Type.INIT_ONLY | X.UI.Attr.Type.LIST, 'none,chrome,container' ],\r
-               width       : [ '100%',         X.UI.Dirty.LAYOUT, X.UI.Attr.USER.LAYOUT, X.UI.Attr.Type.LENGTH | X.UI.Attr.Type.PERCENT | X.UI.Attr.Type.AUTO ],\r
-               height      : [ X.UI.Attr.AUTO, X.UI.Dirty.LAYOUT, X.UI.Attr.USER.LAYOUT, X.UI.Attr.Type.LENGTH | X.UI.Attr.Type.PERCENT | X.UI.Attr.Type.AUTO ],\r
-               childWidth  : [ X.UI.Attr.AUTO, X.UI.Dirty.LAYOUT, X.UI.Attr.USER.LAYOUT, X.UI.Attr.Type.LENGTH | X.UI.Attr.Type.PERCENT | X.UI.Attr.Type.AUTO ],\r
-               childHeight : [ X.UI.Attr.AUTO, X.UI.Dirty.LAYOUT, X.UI.Attr.USER.LAYOUT, X.UI.Attr.Type.LENGTH | X.UI.Attr.Type.PERCENT | X.UI.Attr.Type.AUTO ],\r
-               gapY        : [ 0,              X.UI.Dirty.LAYOUT, X.UI.Attr.USER.LAYOUT, X.UI.Attr.Type.LENGTH ]\r
+               role        : [ 0,              XUI_Dirty.CLEAN,  XUI_Attr_USER.UINODE, XUI_Attr_Type.INIT_ONLY | XUI_Attr_Type.LIST, 'none,chrome,container' ],\r
+               width       : [ '100%',         XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH | XUI_Attr_Type.PERCENT | XUI_Attr_Type.AUTO ],\r
+               height      : [ XUI_Attr_AUTO, XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH | XUI_Attr_Type.PERCENT | XUI_Attr_Type.AUTO ],\r
+               childWidth  : [ XUI_Attr_AUTO, XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH | XUI_Attr_Type.PERCENT | XUI_Attr_Type.AUTO ],\r
+               childHeight : [ XUI_Attr_AUTO, XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH | XUI_Attr_Type.PERCENT | XUI_Attr_Type.AUTO ],\r
+               gapY        : [ 0,              XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH ]\r
        },\r
        \r
        overrideAttrsForChild : {\r
@@ -33,8 +33,8 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
                \r
                contentW       = data.contentWidth;\r
                contentH       = data.contentHeight;\r
-               autoW          = contentW === X.UI.Attr.AUTO;\r
-               autoH          = contentH === X.UI.Attr.AUTO;\r
+               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
@@ -52,10 +52,10 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
                                _y += node.boxHeight + gapY;\r
                                // 概算のみ\r
                                if( autoW ){\r
-                                       if( node.boxWidth !== X.UI.Attr.AUTO ){\r
+                                       if( node.boxWidth !== XUI_Attr_AUTO ){\r
                                                w = node.boxWidth;\r
                                        } else\r
-                                       if( node.minBoxWidth !== X.UI.Attr.AUTO ){\r
+                                       if( node.minBoxWidth !== XUI_Attr_AUTO ){\r
                                                w = node.minBoxWidth;\r
                                                minFlag = true;\r
                                        } else {\r
@@ -66,7 +66,7 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
                        };\r
                        _y -= gapY;\r
                } else {\r
-                       _y = data.minContentHeight !== X.UI.Attr.AUTO ? data.minContentHeight : 0;\r
+                       _y = data.minContentHeight !== XUI_Attr_AUTO ? data.minContentHeight : 0;\r
                };\r
 \r
                if( detectionPhase ){\r
@@ -81,14 +81,16 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
                        data.postMesure();\r
                };\r
                \r
-               !isNeedsDetection && data.updateLayout( x + data.boxX, y + data.boxY );\r
-               \r
+               if( !isNeedsDetection ){\r
+                       data.boxX += x;\r
+                       data.boxY += y;                 \r
+               };\r
                return !ret;\r
        }\r
 });\r
 \r
 X.UI.VBox = X.UI.Box.presets(\r
-       X.UI.Layout.Vertical,\r
+       XUI_Layout_Vertical,\r
        'VBox',\r
        {\r
                gapY       : '0.2em',\r