Version 0.6.153, fix layout @X.UI.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 08_Box.js

diff --git a/0.6.x/js/20_ui/08_Box.js b/0.6.x/js/20_ui/08_Box.js
index 1d01e5e..0725fc3 100644 (file)
--- a/0.6.x/js/20_ui/08_Box.js
+++ b/0.6.x/js/20_ui/08_Box.js
@@ -28,10 +28,11 @@ var XUI_Layout_Canvas = X[ 'UI' ][ 'Layout' ][ 'Canvas' ] = XUI_createLayout( {
                \r
                _x = data.contentL;\r
                _y = data.contentT;\r
-               _w = data.contentWidth;\r
-               _h = data.contentHeight;\r
+               _w = data.contentWidth//  !== XUI_Attr_AUTO ? data.contentWidth  : data.minContentWidth;\r
+               _h = data.contentHeight// !== XUI_Attr_AUTO ? data.contentHeight : data.minContentHeight;\r
 \r
                if( ( uinodes = data.uinodes ) && ( l = uinodes.length ) ){\r
+                       console.log( _w + ' x ' + _h + ' l:' + l );\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r
                                node.calculate( false, _x, _y, _w, _h );\r
@@ -45,7 +46,7 @@ var XUI_Layout_Canvas = X[ 'UI' ][ 'Layout' ][ 'Canvas' ] = XUI_createLayout( {
 \r
                if( !isNeedsDetection ){\r
                        data.boxX += x;\r
-                       data.boxY += y;                 \r
+                       data.boxY += y;\r
                };\r
                return true;\r
        }\r