You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/11/15 08:18:26 UTC
git commit: [flex-sdk] [refs/heads/develop] - Revert "FLEX-33879 fix
scrolling issue"
Updated Branches:
refs/heads/develop 03cf3a2e3 -> c3cc4ce02
Revert "FLEX-33879 fix scrolling issue"
This reverts commit 6a07ef67dce6edca9f7ec72a4b4eb109e345bb1a.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c3cc4ce0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c3cc4ce0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c3cc4ce0
Branch: refs/heads/develop
Commit: c3cc4ce02ed3a3e88b893f0cd61e5efcea444881
Parents: 03cf3a2
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Nov 15 18:16:13 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Nov 15 18:16:13 2013 +1100
----------------------------------------------------------------------
.../spark/src/spark/layouts/supportClasses/LayoutBase.as | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c3cc4ce0/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 d624a72..5bff8cd 100644
--- a/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as
+++ b/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as
@@ -1549,14 +1549,16 @@ 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;
- if ((elementR.bottom <= scrollR.bottom) && (elementR.top >= scrollR.top))
+ else 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;
- if ((elementR.bottom >= scrollR.bottom) && (elementR.top <= scrollR.top))
+ else if ((elementR.bottom >= scrollR.bottom) && (elementR.top <= scrollR.top))
dy = 0;
}