diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 10c7599419..48e023679c 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -739,6 +739,7 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ */ _loadSceneByUuid: function (uuid, onLaunched, onUnloaded) { //cc.AssetLibrary.unloadAsset(uuid); // force reload + cc._widgetManager._nodesWithWidget.length = 0; cc.AssetLibrary.loadAsset(uuid, function (error, sceneAsset) { var self = cc.director; self._loadingScene = ''; diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 7d8a1af07d..bc17190460 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -986,6 +986,7 @@ var Node = cc.Class({ if (activeInHierarchyBefore !== shouldActiveNow) { this._onActivatedInHierarchy(shouldActiveNow); } + cc._widgetManager._nodesOrderDirty = true; if (CC_DEV) { var scene = cc.director.getScene(); var inCurrentSceneBefore = oldParent && oldParent.isChildOf(scene); diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 00d3846fa8..2546c77cbf 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -115,6 +115,7 @@ function visitNode (node) { var widget = node._widget; if (widget) { alignToParent(node, widget); + widgetManager._nodesWithWidget.push(node); if (!CC_EDITOR && widget.isAlignOnce) { widget.enabled = false; } @@ -132,7 +133,17 @@ function refreshScene () { var scene = cc.director.getScene(); if (scene) { widgetManager.isAligning = true; - visitNode(scene); + if (widgetManager._nodesOrderDirty) { + widgetManager._nodesWithWidget.length = 0; + visitNode(scene); + widgetManager._nodesOrderDirty = false; + } else { + var totalLength = widgetManager._nodesWithWidget.length; + for(var i = 0; i < totalLength; i++) { + var node = widgetManager._nodesWithWidget[i]; + alignToParent(node, node._widget); + } + } widgetManager.isAligning = false; } } @@ -223,11 +234,18 @@ var adjustWidgetToAllowResizingInEditor = CC_EDITOR && function (event) { var widgetManager = cc._widgetManager = { isAligning: false, + _nodesOrderDirty: true, + _nodesWithWidget: [], init: function (director) { director.on(cc.Director.EVENT_BEFORE_VISIT, refreshScene); + director.on(cc.Director.EVENT_BEFORE_SCENE_LAUNCH, this._resetNodesOrderDirty); + }, + _resetNodesOrderDirty: function() { + this._nodesOrderDirty = true; }, add: function (widget) { widget.node._widget = widget; + this._resetNodesOrderDirty(); if (CC_EDITOR && !cc.engine.isPlaying) { widget.node.on('position-changed', adjustWidgetToAllowMovingInEditor, widget); widget.node.on('size-changed', adjustWidgetToAllowResizingInEditor, widget); @@ -235,6 +253,7 @@ var widgetManager = cc._widgetManager = { }, remove: function (widget) { widget.node._widget = null; + this._resetNodesOrderDirty(); if (CC_EDITOR && !cc.engine.isPlaying) { widget.node.off('position-changed', adjustWidgetToAllowMovingInEditor, widget); widget.node.off('size-changed', adjustWidgetToAllowResizingInEditor, widget);