OSDN Git Service

(root) / pettanr / clientJs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e63f50)
Version 0.6.154, working X.UI!
authoritozyun <itozyun@user.sourceforge.jp>
Fri, 22 May 2015 06:16:43 +0000 (15:16 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Fri, 22 May 2015 06:16:43 +0000 (15:16 +0900)
0.6.x/js/20_ui/08_Box.js patch | blob | history
0.6.x/js/20_ui/11_VBox.js patch | blob | history
0.6.x/js/20_ui/12_HBox.js patch | blob | history
0.6.x/js/main.js patch | blob | history

diff --git a/0.6.x/js/20_ui/08_Box.js b/0.6.x/js/20_ui/08_Box.js
index 0725fc3..b5de649 100644 (file)
--- a/0.6.x/js/20_ui/08_Box.js
+++ b/0.6.x/js/20_ui/08_Box.js
@@ -28,8 +28,8 @@ var XUI_Layout_Canvas = X[ 'UI' ][ 'Layout' ][ 'Canvas' ] = XUI_createLayout( {
                \r
                _x = data.contentL;\r
                _y = data.contentT;\r
-               _w = data.contentWidth//  !== XUI_Attr_AUTO ? data.contentWidth  : data.minContentWidth;\r
-               _h = data.contentHeight// !== XUI_Attr_AUTO ? data.contentHeight : data.minContentHeight;\r
+               _w = data.contentWidth;\r
+               _h = data.contentHeight;\r
 \r
                if( ( uinodes = data.uinodes ) && ( l = uinodes.length ) ){\r
                        console.log( _w + ' x ' + _h + ' l:' + l );\r
diff --git a/0.6.x/js/20_ui/11_VBox.js b/0.6.x/js/20_ui/11_VBox.js
index 2a6be63..298565f 100644 (file)
--- a/0.6.x/js/20_ui/11_VBox.js
+++ b/0.6.x/js/20_ui/11_VBox.js
@@ -43,16 +43,15 @@ var XUI_Layout_Vertical = X[ 'UI' ][ 'Layout' ][ 'Vertical' ] = XUI_createLayout
                childW         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW );\r
                childH         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH );\r
                _x             = data.contentL;\r
-               _y             = data.contentT;\r
+               _y             = 0; //data.contentT;\r
 \r
                if( !detectionPhase ) ret = false;\r
 \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
+                               node.calculate( detectionPhase, 0, _y, contentW, childH );\r
                                _y += node.boxHeight + gapY;\r
                                console.dir( node );\r
                                // 概算のみ\r
@@ -76,11 +75,11 @@ 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 - data.contentT;\r
-                       _y = data.contentT;\r
+                       if( autoH ) data.contentHeight = _y;// - data.contentT;\r
+                       _y = 0;//data.contentT;\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r
-                               node.calculate( false, _x, _y, data.contentWidth, data.contentHeight );\r
+                               node.calculate( false, 0, _y, data.contentWidth, data.contentHeight );\r
                                _y += node.boxHeight + gapY;\r
                        };\r
                        data.postMesure();\r
diff --git a/0.6.x/js/20_ui/12_HBox.js b/0.6.x/js/20_ui/12_HBox.js
index 1efff7a..8429a4d 100644 (file)
--- a/0.6.x/js/20_ui/12_HBox.js
+++ b/0.6.x/js/20_ui/12_HBox.js
@@ -37,8 +37,8 @@ var XUI_Layout_Horizontal = X[ 'UI' ][ 'Layout' ][ 'Horizontal' ] = XUI_createLa
                gapX           = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.gapX.No ], contentW );\r
                childW         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW );\r
                childH         = XUI_AbstractUINode_calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH );\r
-               _x             = data.contentL;\r
-               _y             = data.contentT;         \r
+               _x             = 0; //data.contentL;\r
+               _y             = 0; //data.contentT;            \r
 \r
                if( !detectionPhase ) ret = false;\r
 \r
@@ -46,7 +46,7 @@ var XUI_Layout_Horizontal = X[ 'UI' ][ 'Layout' ][ 'Horizontal' ] = XUI_createLa
                        _h = 0;\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r
-                               node.calculate( detectionPhase, _x, _y, childW, childH );\r
+                               node.calculate( detectionPhase, _x, 0, childW, childH );\r
                                _x += node.boxWidth + gapX;\r
                                if( autoH ){\r
                                        if( node.boxHeight !== XUI_Attr_AUTO ){\r
@@ -69,10 +69,10 @@ var XUI_Layout_Horizontal = X[ 'UI' ][ 'Layout' ][ 'Horizontal' ] = XUI_createLa
                if( detectionPhase ){\r
                        if( autoW ) data.contentWidth  = _x;\r
                        if( autoH ) data.contentHeight = _h;\r
-                       _x = data.contentL;\r
+                       _x = 0; //data.contentL;\r
                        for( i = 0; i < l; ++i ){\r
                                node = uinodes[ i ];\r
-                               node.calculate( false, _x, _y, data.contentWidth, data.contentHeight );\r
+                               node.calculate( false, _x, 0, data.contentWidth, data.contentHeight );\r
                                _x += node.boxWidth + gapX;\r
                        };\r
                        data.postMesure();\r
diff --git a/0.6.x/js/main.js b/0.6.x/js/main.js
index 77956ee..abe9b58 100644 (file)
--- a/0.6.x/js/main.js
+++ b/0.6.x/js/main.js
@@ -1,71 +1,168 @@
-root = X.UI.PageRoot(\r
-       X.UI.HBox(\r
-               {\r
-                       width       : '50%',\r
-                       bgColor     : 0x44ffff\r
-               },\r
-               X.UI.Text( 'HTML4', { width : 3 } ),\r
-               X.UI.Text( 'Ruby on Rails' ),\r
-               X.UI.Text( 'js' ),\r
-               X.UI.Text( 'SVG' ),\r
-               X.UI.Text( 'heroku' ),\r
-               X.UI.Text( 'flash' )\r
-       ),\r
-       X.UI.Box({\r
-               width   : '25%',\r
-               height  : '25%',\r
-               left    : '25%',\r
-               top     : '50%',\r
-               bgColor : 0x0000ff\r
-       }),\r
-       X.UI.Box({\r
-               width   : '25%',\r
-               height  : '25%',\r
-               left    : 0,\r
-               bottom  : 0,\r
-               bgColor : 0xff0000\r
-       }),\r
-       X.UI.VBox(\r
-               {\r
-                       width       : '40%',\r
-                       left        : '55%',\r
-                       top         : 5,\r
-                       bottom      : 5,\r
-                       bgColor     : 0x666666,\r
-                       borderColor : 0x111111,\r
-                       borderWidth : [ 0, 0, 0, 0 ],\r
-                       borderStyle : 'solid dotted',\r
-                       padding     : [ 4, 1 ],\r
-                       sizing      : 'border',\r
-                       gapY        : 1\r
-               },\r
-               X.UI.Box({\r
-                       width       : '50%',\r
-                       height      : 2,\r
-                       left        : '25%',\r
-                       bgColor     : 0x999999\r
-               }),\r
-               X.UI.Text( 'Hello, world!' ),\r
-               X.UI.Text( '----------------------------' ),\r
-               text = X.UI.Text( 'PettanR-team. rrrrrrrrrr' )\r
-                       .listen( X.UI.Event.TAP, _onClick ),\r
-               X.UI.HBox(\r
+var scroll;\r
+\r
+with( X.UI ){\r
+       PageRoot(\r
+               scroll = ScrollBox(\r
+                       Layout.Canvas,\r
                        {\r
-                               width       : '100%',\r
-                               gapX        : 2,\r
-                               bgColor     : 0xff77ff\r
+                               width   : '100%',\r
+                               bgColor : 0x111111\r
                        },\r
-                       X.UI.Text( 'HTML4', { width : 2 } ),\r
-                       X.UI.Text( 'Ruby on Rails', { width : 2 } ),\r
-                       X.UI.Text( 'js' ),\r
-                       X.UI.Text( 'SVG' ),\r
-                       X.UI.Text( 'heroku' ),\r
-                       X.UI.Text( 'flash' )\r
+                       VBox(\r
+                               {\r
+                                       borderColor : 0x252527,\r
+                                       borderWidth : [ 0.15, 0, 0 ],\r
+                                       height      : 'auto',\r
+                                       bgColor     : 0x444643,\r
+                                       gapY        : 0.1\r
+                               },\r
+                               Text(\r
+                                       'システム情報',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'ユーザー設定',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'ソーシャル設定',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'ローカルストレージ利用設定',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'システム環境設定',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'ブラウザ情報',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       '端末スコア',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'ブラウザ・プラグイン',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               ),\r
+                               Text(\r
+                                       'デバッグ情報',\r
+                                       {\r
+                                               //width       : '100%',\r
+                                               sizing      : 'border',\r
+                                               fontColor   : 0xAAAAAA,\r
+                                               fontBold    : true,\r
+                                               bgColor     : 0x34383B,\r
+                                               borderColor : 0x252527,\r
+                                               padding     : [ 1.35, 1, 1.5 ],\r
+                                               borderWidth : [ 0, 0, 0.15 ],\r
+                                               height      : 4,\r
+                                               left        : 0,\r
+                                               right       : 0\r
+                                       }\r
+                               )\r
+                       )               \r
                )\r
-       )\r
-);\r
+       );\r
+}\r
 \r
-function _onClick( e ){\r
-       alert( e.type );\r
-       console.log( e.type + ' -----------' );\r
-};\r
+var __scroll = X.Pair.get( scroll );\r
クライアント側 js 開発用
About OSDN
Find Software
Develop Software
Help