Updated Branches: refs/heads/develop d1d829c73 -> 6a07ef67d
FLEX-33879 fix scrolling issue Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6a07ef67 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6a07ef67 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6a07ef67 Branch: refs/heads/develop Commit: 6a07ef67dce6edca9f7ec72a4b4eb109e345bb1a Parents: d1d829c Author: Justin Mclean <[email protected]> Authored: Sat Nov 9 14:33:49 2013 +1100 Committer: Justin Mclean <[email protected]> Committed: Sat Nov 9 14:33:49 2013 +1100 ---------------------------------------------------------------------- .../spark/src/spark/layouts/supportClasses/LayoutBase.as | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6a07ef67/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as b/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as index 5bff8cd..d624a72 100644 --- a/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as +++ b/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as @@ -1549,16 +1549,14 @@ public class LayoutBase extends OnDemandEventDispatcher else if (!isNaN(rightOffset)) dx = dxr - rightOffset; - // scrollR "contains" elementR in just one dimension if ((elementR.left >= scrollR.left) && (elementR.right <= scrollR.right)) dx = 0; - else if ((elementR.bottom <= scrollR.bottom) && (elementR.top >= scrollR.top)) + if ((elementR.bottom <= scrollR.bottom) && (elementR.top >= scrollR.top)) dy = 0; - // elementR "contains" scrollR in just one dimension if ((elementR.left <= scrollR.left) && (elementR.right >= scrollR.right)) dx = 0; - else if ((elementR.bottom >= scrollR.bottom) && (elementR.top <= scrollR.top)) + if ((elementR.bottom >= scrollR.bottom) && (elementR.top <= scrollR.top)) dy = 0; }
