X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F11_VBox.js;h=f11c592681a4b0f3e07dbeba09346e16c8e5fb63;hb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;hp=298565fc4df107e6e32958b8470a5869040fa54c;hpb=e179079404973a959d1806464b7b6881b5510f2a;p=pettanr%2FclientJs.git

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