You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2015/01/21 21:07:15 UTC
[2/6] git commit: [flex-sdk] [refs/heads/develop] - Revert "Fix for
Callout positioning on rotate FLEX-34712"
Revert "Fix for Callout positioning on rotate FLEX-34712"
This reverts commit b5e1c0b1ba007709194cd61e2cf117959b467828.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6e0a356f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6e0a356f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6e0a356f
Branch: refs/heads/develop
Commit: 6e0a356fc1d9297f6f7cc5a0b72cc51cbbabd49f
Parents: b5e1c0b
Author: Kevin Godell <ke...@gmail.com>
Authored: Fri Jan 9 19:26:41 2015 -0600
Committer: Kevin Godell <ke...@gmail.com>
Committed: Fri Jan 9 19:26:41 2015 -0600
----------------------------------------------------------------------
.../spark/src/spark/components/Callout.as | 41 +++-----------------
1 file changed, 6 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6e0a356f/frameworks/projects/spark/src/spark/components/Callout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Callout.as b/frameworks/projects/spark/src/spark/components/Callout.as
index 5e86e3e..e7574b5 100644
--- a/frameworks/projects/spark/src/spark/components/Callout.as
+++ b/frameworks/projects/spark/src/spark/components/Callout.as
@@ -244,8 +244,6 @@ public class Callout extends SkinnablePopUpContainer
//--------------------------------------------------------------------------
private var invalidatePositionFlag:Boolean = false;
-
- private var stageOrientationChangedFlag:Boolean = false;
//--------------------------------------------------------------------------
//
@@ -766,7 +764,6 @@ public class Callout extends SkinnablePopUpContainer
// reset state
invalidatePositionFlag = false;
arrowDirectionAdjusted = false;
- stageOrientationChangedFlag = false;
// Add to PopUpManager, calls updatePopUpPosition(), and change state
super.open(owner, modal);
@@ -776,10 +773,6 @@ public class Callout extends SkinnablePopUpContainer
if (systemManagerParent)
systemManagerParent.addEventListener(Event.RESIZE, systemManager_resizeHandler);
-
- // Detect stage orientation change and set flag
- if (stage)
- stage.addEventListener(StageOrientationEvent.ORIENTATION_CHANGE, stage_orientationChangeHandler);
}
/**
@@ -794,9 +787,6 @@ public class Callout extends SkinnablePopUpContainer
if (systemManagerParent)
systemManagerParent.removeEventListener(Event.RESIZE, systemManager_resizeHandler);
-
- if (stage)
- stage.removeEventListener(StageOrientationEvent.ORIENTATION_CHANGE, stage_orientationChangeHandler);
super.close(commit, data);
}
@@ -812,17 +802,8 @@ public class Callout extends SkinnablePopUpContainer
// explicit changes to horizontalPostion and verticalPosition.
if (isOpen && invalidatePositionFlag)
{
- //check if stage orientation changed
- if (stageOrientationChangedFlag)
- {
- //queue call to updatePopUpPosition
- callLater(updatePopUpPosition);
- stageOrientationChangedFlag = false;
- }
- else
- {
- updatePopUpPosition();
- }
+ updatePopUpPosition();
+ invalidatePositionFlag = false;
}
// Position the arrow
@@ -1702,29 +1683,19 @@ public class Callout extends SkinnablePopUpContainer
*/
private function systemManager_resizeHandler(event:Event):void
{
- // Remove explicit settings if due to Resize effect
- softKeyboardEffectResetExplicitSize();
+ // Remove explicit settings if due to Resize effect
+ softKeyboardEffectResetExplicitSize();
// Screen resize might require a new arrow direction and callout position
invalidatePosition();
- if (!isSoftKeyboardEffectActive)
+ if (!isSoftKeyboardEffectActive)
{
// Force validation and use new screen size only if the keyboard
// effect is not active. The stage dimensions may be invalid while
// the soft keyboard is active. See SDK-31860.
validateNow();
}
- }
-
- /**
- * @private
- */
- private function stage_orientationChangeHandler(event:StageOrientationEvent):void
- {
- //set flag to use in updateDisplayList
- //for queuing call to updatePopUpPosition
- stageOrientationChangedFlag = true;
}
- }
}
+}
\ No newline at end of file