Repository: flex-sdk Updated Branches: refs/heads/release4.12.0 1add2e388 -> 6605f3234
FLEX-34084 Stop RTE from happening Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/eb342431 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/eb342431 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/eb342431 Branch: refs/heads/release4.12.0 Commit: eb3424318703b08f4bedbc9f573152fb7834d851 Parents: 1add2e3 Author: Justin Mclean <[email protected]> Authored: Mon Feb 17 18:17:39 2014 +1100 Committer: Justin Mclean <[email protected]> Committed: Mon Feb 17 18:17:39 2014 +1100 ---------------------------------------------------------------------- frameworks/projects/mx/src/mx/controls/Menu.as | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/eb342431/frameworks/projects/mx/src/mx/controls/Menu.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/Menu.as b/frameworks/projects/mx/src/mx/controls/Menu.as index 07151ce..0f9b664 100644 --- a/frameworks/projects/mx/src/mx/controls/Menu.as +++ b/frameworks/projects/mx/src/mx/controls/Menu.as @@ -1398,8 +1398,11 @@ public class Menu extends List implements IFocusManagerContainer { super.updateDisplayList(unscaledWidth, unscaledHeight); - border.move(0, 0); - border.visible = (dataProvider != null && dataProvider.length > 0); + if (border) + { + border.move(0, 0); + border.visible = (dataProvider != null && dataProvider.length > 0); + } // there's sort of a bug in the player that if we don't give size to the // hiddenItem it gets set to width = 0 and then you can't measure text anymore.
