Version 0.6.153, fix layout @X.UI.

[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 d56665b..2a6be63 100644 (file)
--- a/0.6.x/js/20_ui/11_VBox.js
+++ b/0.6.x/js/20_ui/11_VBox.js
@@ -49,10 +49,12 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
 \r
                if( l ){\r
                        _w = 0;\r
+                       console.log( '-----------' );\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r
                                node.calculate( detectionPhase, _x, _y, contentW, childH );\r
                                _y += node.boxHeight + gapY;\r
+                               console.dir( node );\r
                                // 概算のみ\r
                                if( autoW ){\r
                                        if( node.boxWidth !== XUI_Attr_AUTO ){\r
@@ -74,7 +76,7 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
 \r
                if( detectionPhase ){\r
                        if( autoW ) data.contentWidth  = _w;\r
-                       if( autoH ) data.contentHeight = _y;\r
+                       if( autoH ) data.contentHeight = _y - data.contentT;\r
                        _y = data.contentT;\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r