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/05/02 05:25:43 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33169 Fix
for scrolling bug
Updated Branches:
refs/heads/develop 8ec4e1485 -> 7d20cec89
FLEX-33169 Fix for scrolling bug
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/46ceb00e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/46ceb00e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/46ceb00e
Branch: refs/heads/develop
Commit: 46ceb00e94b38218ffc9d9f0e70d76096280823b
Parents: 8ec4e14
Author: Justin Mclean <jm...@apache.org>
Authored: Thu May 2 13:20:35 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu May 2 13:20:35 2013 +1000
----------------------------------------------------------------------
.../projects/spark/src/spark/components/List.as | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/46ceb00e/frameworks/projects/spark/src/spark/components/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/List.as b/frameworks/projects/spark/src/spark/components/List.as
index 84ac9e1..9114ded 100644
--- a/frameworks/projects/spark/src/spark/components/List.as
+++ b/frameworks/projects/spark/src/spark/components/List.as
@@ -1934,7 +1934,7 @@ public class List extends ListBase implements IFocusManagerComponent
validateProperties();
mouseDownPoint = event.target.localToGlobal(new Point(event.localX, event.localY));
- mouseDownObject = event.target as DisplayObject;
+ mouseDownObject = event.currentTarget as DisplayObject;
mouseDownIndex = newIndex;
var listenForDrag:Boolean = (dragEnabled && getStyle("interactionMode") == InteractionMode.MOUSE && selectedIndices && this.selectedIndices.indexOf(newIndex) != -1);
[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33523 Change
so scaling works in fill and crop modes. Mustella tests pass no objections to
fix on list.
Posted by jm...@apache.org.
FLEX-33523 Change so scaling works in fill and crop modes. Mustella tests pass no objections to fix on list.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7d20cec8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7d20cec8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7d20cec8
Branch: refs/heads/develop
Commit: 7d20cec89baeeb9423a52043779b803d9957e613
Parents: 46ceb00
Author: Justin Mclean <jm...@apache.org>
Authored: Thu May 2 13:25:31 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu May 2 13:25:31 2013 +1000
----------------------------------------------------------------------
.../spark/src/spark/primitives/BitmapImage.as | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7d20cec8/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
index 8377107..c786b45 100644
--- a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
+++ b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
@@ -221,6 +221,7 @@ public class BitmapImage extends GraphicElement
private var previousUnscaledHeight:Number;
private var sourceInvalid:Boolean;
private var loadFailed:Boolean;
+ private var dpiScale:Number = 1;
//----------------------------------
// bitmapData
@@ -949,7 +950,6 @@ public class BitmapImage extends GraphicElement
*/
override protected function measure():void
{
- var dpiScale:Number = 1;
var app:Object = FlexGlobals.topLevelApplication;
if ("applicationDPI" in app && "runtimeDPI" in app && source is MultiDPIBitmapSource)
dpiScale = app.runtimeDPI / app.applicationDPI;
@@ -1107,8 +1107,8 @@ public class BitmapImage extends GraphicElement
g.lineStyle();
var repeatBitmap:Boolean = false;
- var fillScaleX:Number = 1;
- var fillScaleY:Number = 1;
+ var fillScaleX:Number = 1/dpiScale;
+ var fillScaleY:Number = 1/dpiScale;
var roundedDrawX:Number = Math.round(drawX);
var roundedDrawY:Number = Math.round(drawY);
var fillWidth:Number = adjustedWidth;