FLEX-33722 stop RTE when dragging a spark datagrid column
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3947a3a8 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3947a3a8 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3947a3a8 Branch: refs/heads/develop Commit: 3947a3a87e4424277ff7cb7e6e6ee0a3d9a8d9e3 Parents: becd002 Author: Justin Mclean <[email protected]> Authored: Mon Sep 16 11:12:34 2013 +1000 Committer: Justin Mclean <[email protected]> Committed: Mon Sep 16 11:12:34 2013 +1000 ---------------------------------------------------------------------- frameworks/projects/framework/src/mx/core/UIComponent.as | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3947a3a8/frameworks/projects/framework/src/mx/core/UIComponent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/core/UIComponent.as b/frameworks/projects/framework/src/mx/core/UIComponent.as index 4eb4a6f..822b49c 100644 --- a/frameworks/projects/framework/src/mx/core/UIComponent.as +++ b/frameworks/projects/framework/src/mx/core/UIComponent.as @@ -6084,18 +6084,19 @@ public class UIComponent extends FlexSprite // then we'll check the transform and see if it's actually transformed. // otherwise we'll check the layoutMatrix on the AdvancedLayoutFeatures object, // to see if we're actually transformed. - if (!_hasComplexLayoutMatrix) + if (!_hasComplexLayoutMatrix) { return false; + } else { if (_layoutFeatures == null) { - _hasComplexLayoutMatrix = !MatrixUtil.isDeltaIdentity(super.transform.matrix); + _hasComplexLayoutMatrix = super.transform.matrix && !MatrixUtil.isDeltaIdentity(super.transform.matrix); return _hasComplexLayoutMatrix; } else { - return !MatrixUtil.isDeltaIdentity(_layoutFeatures.layoutMatrix); + return _layoutFeatures.layoutMatrix && !MatrixUtil.isDeltaIdentity(_layoutFeatures.layoutMatrix); } } }
