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/10 09:09:16 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34032 Fix
ActiveWindowManager injection. Top-Level Windows can switch between the
top-most modal and non-modal windows floating above it,
not just among the non-modal windows
Updated Branches:
refs/heads/develop 5d0b30c79 -> b0b5820d9
FLEX-34032 Fix ActiveWindowManager injection. Top-Level Windows can switch between the top-most modal and non-modal windows floating above it, not just among the non-modal windows
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a5ff72a9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a5ff72a9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a5ff72a9
Branch: refs/heads/develop
Commit: a5ff72a99190bb72a5ed89464c57abdb63fb4625
Parents: 036df07
Author: Alex Harui <ah...@apache.org>
Authored: Sun Feb 9 23:44:01 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Feb 9 23:44:01 2014 -0800
----------------------------------------------------------------------
.../src/mx/managers/systemClasses/ActiveWindowManager.as | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a5ff72a9/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as b/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as
index b0c9b5d..337fc28 100644
--- a/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as
+++ b/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as
@@ -464,9 +464,9 @@ public class ActiveWindowManager extends EventDispatcher implements IActiveWindo
var startIndex:int = 0;
if (numModalWindows > 0)
{
- // if there is a modal window, only non-modal
+ // if there is a modal window, only the top modal and non-modal
// windows above it are in play
- startIndex = findHighestModalForm() + 1;
+ startIndex = findHighestModalForm();
}
if (!systemManager.isTopLevelRoot() || forms.length > 1)
@@ -520,7 +520,10 @@ public class ActiveWindowManager extends EventDispatcher implements IActiveWindo
index = childList.getChildIndex(p);
newIndex = index;
-
+ // activating top-most modal so don't switch it to the top
+ if (p == forms[startIndex])
+ return;
+
//we need to reset n because activating p's
//FocusManager could have caused
//forms.length to have changed.
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Merge
remote-tracking branch 'origin/release4.12.0' into develop
Posted by jm...@apache.org.
Merge remote-tracking branch 'origin/release4.12.0' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b0b5820d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b0b5820d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b0b5820d
Branch: refs/heads/develop
Commit: b0b5820d9ef86e075fffa25d4bb5ac0a83c51a67
Parents: 5d0b30c a5ff72a
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Feb 10 19:08:51 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Feb 10 19:08:51 2014 +1100
----------------------------------------------------------------------
.../src/mx/managers/systemClasses/ActiveWindowManager.as | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------