X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2F20_ui%2F13_TileBox.js;fp=0.6.x%2Fjs%2F20_ui%2F13_TileBox.js;h=a01198e13268702f45e60a284e63883195400fd7;hb=86c591d2888cf7b24365c1950646fb1f6190efd1;hp=06c2a6d545c46d275ca73c3ca06f3d2e919cfd3e;hpb=6002fdac540134f01738f95246c0ea66302bd702;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/20_ui/13_TileBox.js b/0.6.x/js/20_ui/13_TileBox.js index 06c2a6d..a01198e 100644 --- a/0.6.x/js/20_ui/13_TileBox.js +++ b/0.6.x/js/20_ui/13_TileBox.js @@ -35,18 +35,18 @@ var XUI_Layout_Tile = X[ 'UI' ][ 'Layout' ][ 'Tile' ] = XUI_createLayout( { _x = data.contentL; _y = data.contentT; _w = data.contentWidth; - gapX = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.gapX.No ], contentW ); - 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 ); + gapX = XUI_AbstractUINode_calcValue( attrs[ data.usableAttrs.gapX.No ], contentW ); + 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 ); numH = XUI_Attr_FLOOR( ( _w + gapX ) / ( childW + gapX ) ); numV = l % numH ? XUI_Attr_FLOOR( l / numH ) + 1 : l / numH; _h = _y + data.contentB + ( childH + gapY ) * numH - gapY; - startX = attrs[ data.supportAttrs.hCenter.No ] ? + startX = attrs[ data.usableAttrs.hCenter.No ] ? ( _w - ( childW + gapX ) * numH - gapX ) / 2 : _x; __x = startX; - __y = attrs[ data.supportAttrs.vCenter.No ] && _h <= h ? + __y = attrs[ data.usableAttrs.vCenter.No ] && _h <= h ? ( h - _h ) / 2 + _y : _y; for( i = 0; i < l; ++i ){ @@ -65,7 +65,7 @@ var XUI_Layout_Tile = X[ 'UI' ][ 'Layout' ][ 'Tile' ] = XUI_createLayout( { } else if( data.contentHeight === XUI_Attr_AUTO ){ - data.contentHeight = data.minContentHeight !== XUI_Attr_AUTO ? data.minContentHeight : 0; + data.contentHeight = data.contentHeightMin !== XUI_Attr_AUTO ? data.contentHeightMin : 0; }; data.postMesure(); @@ -98,12 +98,12 @@ X.UI.TileBox = X.UI.Box.inherits( var supports; if( !XUI_TileBox ){ - supports = XUI_Attr_createAttrDef( XUI_Box.prototype.supportAttrs, XUI_Layout_Tile.overrideAttrsForSelf ); + supports = XUI_Attr_createAttrDef( XUI_Box.prototype.usableAttrs, XUI_Layout_Tile.overrideAttrsForSelf ); XUI_TileBox = XUI_Box.inherits( { layout : XUI_Layout_Tile, - supportAttrs : supports, + usableAttrs : supports, attrClass : XUI_Attr_preset( XUI_Box.prototype.attrClass, supports, { gapX : '0.2em', gapY : '0.2em',