You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/11/21 18:41:57 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - this test now
needs some pixel tolerance
Repository: flex-sdk
Updated Branches:
refs/heads/develop 4ade4cc68 -> 27501dddc
this test now needs some pixel tolerance
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/27501ddd
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/27501ddd
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/27501ddd
Branch: refs/heads/develop
Commit: 27501dddc28e7e5e072dda7abc0ccfa5ba8b9e6c
Parents: 1f4b752
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 21 09:41:15 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 21 09:41:34 2014 -0800
----------------------------------------------------------------------
.../tests/components/Alert/Properties/Alert_Properties_Spark.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/27501ddd/mustella/tests/components/Alert/Properties/Alert_Properties_Spark.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Alert/Properties/Alert_Properties_Spark.mxml b/mustella/tests/components/Alert/Properties/Alert_Properties_Spark.mxml
index ba782b6..696f5c4 100644
--- a/mustella/tests/components/Alert/Properties/Alert_Properties_Spark.mxml
+++ b/mustella/tests/components/Alert/Properties/Alert_Properties_Spark.mxml
@@ -74,7 +74,7 @@
</setup>
<body>
<WaitForLayoutManager />
- <CompareBitmap url="../Properties/baselines/$testID.png" target="curAlert"/>
+ <CompareBitmap url="../Properties/baselines/$testID.png" target="curAlert" numColorVariances="4" maxColorVariance="4" />
<DispatchKeyEvent key="SPACE" />
</body>
</TestCase>
[2/2] git commit: [flex-sdk] [refs/heads/develop] - even better fix
for FLEX-34454
Posted by ah...@apache.org.
even better fix for FLEX-34454
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1f4b7522
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1f4b7522
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1f4b7522
Branch: refs/heads/develop
Commit: 1f4b752224ac60d6015afd048564d512240d254e
Parents: 4ade4cc
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 21 09:40:47 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 21 09:41:34 2014 -0800
----------------------------------------------------------------------
.../projects/framework/src/mx/managers/PopUpManagerImpl.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1f4b7522/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
index a3f1766..55a40d2 100644
--- a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
@@ -1047,7 +1047,6 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
// don't remove blur unless this is the first modal window to put up the blur
if (blurOwners[sm] != null && blurOwners[sm] == o.owner)
{
- blurOwners[sm] = null;
// Blur effect on the application
const blurAmount:Number = popUpStyleClient.getStyle("modalTransparencyBlur");
@@ -1279,6 +1278,8 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
awm.numModalWindows--;
}
+ if (blurOwners[sm] == o.owner)
+ blurOwners[sm] = null;
popupInfo.splice(i, 1);
break;
}
@@ -1337,7 +1338,6 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
if (obj.parent) // Mustella can already take you off stage
obj.parent.removeChild(obj);
}
-
}
/**