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 2014/02/20 04:00:58 UTC
git commit: [flex-sdk] [refs/heads/develop] - reverting change due to
a couple of failing tests
Repository: flex-sdk
Updated Branches:
refs/heads/develop 670c00584 -> 5dfc698ae
reverting change due to a couple of failing tests
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5dfc698a
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5dfc698a
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5dfc698a
Branch: refs/heads/develop
Commit: 5dfc698aed316535f2d29a0a862b7e3c96d94051
Parents: 670c005
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Feb 20 13:59:56 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Feb 20 13:59:56 2014 +1100
----------------------------------------------------------------------
.../spark/src/spark/components/HScrollBar.as | 20 ++++++++----------
.../spark/src/spark/components/VScrollBar.as | 22 +++++++++-----------
2 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5dfc698a/frameworks/projects/spark/src/spark/components/HScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/HScrollBar.as b/frameworks/projects/spark/src/spark/components/HScrollBar.as
index b06bfcb..e88f62a 100644
--- a/frameworks/projects/spark/src/spark/components/HScrollBar.as
+++ b/frameworks/projects/spark/src/spark/components/HScrollBar.as
@@ -323,20 +323,18 @@ public class HScrollBar extends ScrollBarBase
thumbPosTrackX = trackSize - thumbSize;
}
+ if (!fixedThumbSize)
+ thumb.setLayoutBoundsSize(thumbSize, NaN);
+
if (getStyle("autoThumbVisibility") === true)
thumb.visible = thumbSize < trackSize;
+
+ // convert thumb position to parent's coordinates.
+ thumbPos = track.localToGlobal(new Point(thumbPosTrackX, 0));
+ if (thumb.parent)
+ thumbPosParentX = thumb.parent.globalToLocal(thumbPos).x;
- if (thumb.visible) {
- if (!fixedThumbSize)
- thumb.setLayoutBoundsSize(thumbSize, NaN);
-
- // convert thumb position to parent's coordinates.
- thumbPos = track.localToGlobal(new Point(thumbPosTrackX, 0));
- if (thumb.parent)
- thumbPosParentX = thumb.parent.globalToLocal(thumbPos).x;
-
- thumb.setLayoutBoundsPosition(Math.round(thumbPosParentX), thumb.getLayoutBoundsY());
- }
+ thumb.setLayoutBoundsPosition(Math.round(thumbPosParentX), thumb.getLayoutBoundsY());
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5dfc698a/frameworks/projects/spark/src/spark/components/VScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/VScrollBar.as b/frameworks/projects/spark/src/spark/components/VScrollBar.as
index c815881..c353bb8 100644
--- a/frameworks/projects/spark/src/spark/components/VScrollBar.as
+++ b/frameworks/projects/spark/src/spark/components/VScrollBar.as
@@ -312,20 +312,18 @@ public class VScrollBar extends ScrollBarBase
thumbPosTrackY = trackSize - thumbSize;
}
+ if (!fixedThumbSize)
+ thumb.setLayoutBoundsSize(NaN, thumbSize);
+
if (getStyle("autoThumbVisibility") === true)
thumb.visible = thumbSize < trackSize;
-
- if (thumb.visible) {
- if (!fixedThumbSize)
- thumb.setLayoutBoundsSize(NaN, thumbSize);
-
- // convert thumb position to parent's coordinates.
- thumbPos = track.localToGlobal(new Point(0, thumbPosTrackY));
- if (thumb.parent)
- thumbPosParentY = thumb.parent.globalToLocal(thumbPos).y;
-
- thumb.setLayoutBoundsPosition(thumb.getLayoutBoundsX(), Math.round(thumbPosParentY));
- }
+
+ // convert thumb position to parent's coordinates.
+ thumbPos = track.localToGlobal(new Point(0, thumbPosTrackY));
+ if (thumb.parent)
+ thumbPosParentY = thumb.parent.globalToLocal(thumbPos).y;
+
+ thumb.setLayoutBoundsPosition(thumb.getLayoutBoundsX(), Math.round(thumbPosParentY));
}