Version 0.6.191, fix X.UI.ScrollBox & X.UI.Gesture.

[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 d0c7818..73e6067 100644 (file)
--- a/0.6.x/js/20_ui/08_Box.js
+++ b/0.6.x/js/20_ui/08_Box.js
@@ -70,8 +70,8 @@ var XUI_Box = XUI_AbstractUINode.inherits(
                pointerChildren : true,\r
                through         : false,\r
 \r
-               scrollingX      : 0, // TODO 現在のスクロール位置\r
-               scrollingY      : 0, // TODO \r
+               scrollXEm       : 0,\r
+               scrollYEm       : 0,\r
 \r
                Constructor : function( user, layout, args ){\r
                        var i = 0,\r
@@ -183,8 +183,8 @@ var XUI_Box = XUI_AbstractUINode.inherits(
                        x -= this.boxX;\r
                        y -= this.boxY;\r
                        if( this.pointerChildren && ( uinodes = this.uinodes ) && ( i = uinodes.length ) ){\r
-                               _x = x - this.scrollingX;\r
-                               _y = y - this.scrollingY;\r
+                               _x = x - this.scrollXEm;\r
+                               _y = y - this.scrollYEm;\r
                                for( ; i; ){\r
                                        child = uinodes[ --i ];\r
                                        if( !child.pointerDisabled && child.boxX <= _x && _x < child.boxX + child.boxWidth && child.boxY <= _y && _y < child.boxY + child.boxHeight && child.capcher( _x, _y ) ){\r