Skip to content

Commit d79cf76

Browse files
author
pandamicro
committed
Fix Scale9Sprite transform issue causing transform stack corrupt
1 parent 57e0c0d commit d79cf76

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

Diff for: extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@
5858
this.originVisit(parentCmd);
5959
};
6060

61-
proto.transform = function(parentCmd){
61+
proto.transform = function(parentCmd, recursive) {
6262
var node = this._node;
63-
cc.Node.CanvasRenderCmd.prototype.transform.call(this, parentCmd);
63+
this.originTransform(parentCmd, recursive);
6464
if (node._positionsAreDirty) {
6565
node._updatePositions();
6666
node._positionsAreDirty = false;
6767
}
6868

6969
var children = node._children;
7070
for(var i=0; i<children.length; i++){
71-
children[i].transform(this, true);
71+
children[i].transform(this);
7272
}
7373
};
7474

Diff for: extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
if(pchild) {
108108
pchild._vertexZ = parentCmd._node._vertexZ;
109109
var tempCmd = pchild._renderCmd;
110-
tempCmd.transform(this, true);
110+
tempCmd.transform(this);
111111
tempCmd._dirtyFlag = tempCmd._dirtyFlag & flags.transformDirty ^ tempCmd._dirtyFlag;
112112
}
113113
else {
@@ -118,7 +118,7 @@
118118
else {
119119
node._adjustScale9ImageScale();
120120
node._adjustScale9ImagePosition();
121-
node._scale9Image._renderCmd.transform(this, true);
121+
node._scale9Image._renderCmd.transform(this);
122122
}
123123
};
124124

Diff for: extensions/ccui/base-classes/UIWidget.js

-13
Original file line numberDiff line numberDiff line change
@@ -323,19 +323,6 @@ ccui.Widget = ccui.ProtectedNode.extend(/** @lends ccui.Widget# */{
323323
return this._isAncestorsVisible(parent);
324324
},
325325

326-
_cleanupWidget: function(){
327-
//clean up _touchListener
328-
this._eventDispatcher.removeEventListener(this._touchListener);
329-
this._touchEnabled = false;
330-
this._touchListener = null;
331-
332-
//cleanup focused widget and focus navigation controller
333-
if (ccui.Widget._focusedWidget === this){
334-
ccui.Widget._focusedWidget = null;
335-
ccui.Widget._focusNavigationController = null;
336-
}
337-
},
338-
339326
/**
340327
* <p>
341328
* Sets whether the widget is enabled <br/>

0 commit comments

Comments
 (0)