-X.UI.Layout.Horizontal = X.UI.Layout.create( { \r
+var XUI_Layout_Horizontal = X[ 'UI' ][ 'Layout' ][ 'Horizontal' ] = XUI_createLayout( { \r
name : 'HorizontalLayout',\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
- gapX : [ 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
+ gapX : [ 0, XUI_Dirty.LAYOUT, XUI_Attr_USER.LAYOUT, XUI_Attr_Type.LENGTH ]\r
},\r
\r
overrideAttrsForChild : {\r
\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
gapX = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.gapX.No ], contentW );\r
childW = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW );\r
node.calculate( detectionPhase, _x, _y, childW, childH );\r
_x += node.boxWidth + gapX;\r
if( autoH ){\r
- if( node.boxHeight !== X.UI.Attr.AUTO ){\r
+ if( node.boxHeight !== XUI_Attr_AUTO ){\r
h = node.boxHeight;\r
} else\r
- if( node.minBoxHeight !== X.UI.Attr.AUTO ){\r
+ if( node.minBoxHeight !== XUI_Attr_AUTO ){\r
h = node.minBoxHeight;\r
minFlag = true;\r
} else {\r
};\r
_x -= gapX;\r
} else {\r
- _h = data.minContentHeight !== X.UI.Attr.AUTO ? data.minContentHeight : 0;\r
+ _h = data.minContentHeight !== XUI_Attr_AUTO ? data.minContentHeight : 0;\r
};\r
\r
if( detectionPhase ){\r
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.HBox = X.UI.Box.presets(\r
- X.UI.Layout.Horizontal,\r
+ XUI_Layout_Horizontal,\r
'HBox',\r
{\r
gapX : '0.2em'\r