Skip to content

Commit f4433a4

Browse files
committed
Issue cocos2d#1267: remove _updateFlipped
1 parent 5b7fb17 commit f4433a4

File tree

2 files changed

+0
-60
lines changed

2 files changed

+0
-60
lines changed

extensions/ccui/uiwidgets/UIButton.js

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
258258
self._findLayout();
259259

260260
self._normalTextureSize = self._buttonNormalRenderer.getContentSize();
261-
self._updateFlippedX();
262-
self._updateFlippedY();
263261
self._updateChildrenDisplayedRGBA();
264262

265263
self._buttonNormalRenderer.setColor(self.getColor());
@@ -293,8 +291,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
293291
this._updateContentSizeWithTextureSize(this._normalTextureSize);
294292

295293
this._normalTextureSize = this._buttonNormalRenderer.getContentSize();
296-
this._updateFlippedX();
297-
this._updateFlippedY();
298294

299295
this._updateChildrenDisplayedRGBA();
300296

@@ -320,8 +316,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
320316
self._findLayout();
321317

322318
self._pressedTextureSize = self._buttonClickedRenderer.getContentSize();
323-
self._updateFlippedX();
324-
self._updateFlippedY();
325319
self._updateChildrenDisplayedRGBA();
326320

327321
self._pressedTextureLoaded = true;
@@ -347,8 +341,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
347341
clickedRenderer.setCapInsets(this._capInsetsPressed);
348342

349343
this._pressedTextureSize = this._buttonClickedRenderer.getContentSize();
350-
this._updateFlippedX();
351-
this._updateFlippedY();
352344

353345
this._updateChildrenDisplayedRGBA();
354346

@@ -375,8 +367,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
375367
self._findLayout();
376368

377369
self._disabledTextureSize = self._buttonDisableRenderer.getContentSize();
378-
self._updateFlippedX();
379-
self._updateFlippedY();
380370
self._updateChildrenDisplayedRGBA();
381371

382372
self._disabledTextureLoaded = true;
@@ -402,8 +392,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
402392
disabledRenderer.setCapInsets(this._capInsetsDisabled);
403393

404394
this._disabledTextureSize = this._buttonDisableRenderer.getContentSize();
405-
this._updateFlippedX();
406-
this._updateFlippedY();
407395

408396
this._updateChildrenDisplayedRGBA();
409397

@@ -666,34 +654,6 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
666654
this.setContentSize(this.getVirtualRendererSize());
667655
},
668656

669-
_updateFlippedX: function () {
670-
var flip = this._flippedX ? -1.0 : 1.0;
671-
this._titleRenderer.setScaleX(flip);
672-
if (this._scale9Enabled) {
673-
this._buttonNormalRenderer.setScaleX(flip);
674-
this._buttonClickedRenderer.setScaleX(flip);
675-
this._buttonDisableRenderer.setScaleX(flip);
676-
} else {
677-
this._buttonNormalRenderer.setFlippedX(this._flippedX);
678-
this._buttonClickedRenderer.setFlippedX(this._flippedX);
679-
this._buttonDisableRenderer.setFlippedX(this._flippedX);
680-
}
681-
},
682-
683-
_updateFlippedY: function () {
684-
var flip = this._flippedY ? -1.0 : 1.0;
685-
this._titleRenderer.setScaleY(flip);
686-
if (this._scale9Enabled) {
687-
this._buttonNormalRenderer.setScaleY(flip);
688-
this._buttonClickedRenderer.setScaleY(flip);
689-
this._buttonDisableRenderer.setScaleY(flip);
690-
} else {
691-
this._buttonNormalRenderer.setFlippedY(this._flippedY);
692-
this._buttonClickedRenderer.setFlippedY(this._flippedY);
693-
this._buttonDisableRenderer.setFlippedY(this._flippedY);
694-
}
695-
},
696-
697657
_updateTexturesRGBA: function(){
698658
this._buttonNormalRenderer.setColor(this.getColor());
699659
this._buttonClickedRenderer.setColor(this.getColor());

extensions/ccui/uiwidgets/UICheckBox.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
156156
bgBoxRenderer.addEventListener("load", function(){
157157
self._findLayout();
158158

159-
self._updateFlippedX();
160-
self._updateFlippedY();
161159
self._updateChildrenDisplayedRGBA();
162160
self._updateContentSizeWithTextureSize(self._backGroundBoxRenderer.getContentSize());
163161
self._backGroundBoxRendererAdaptDirty = true;
@@ -183,8 +181,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
183181
this._updateContentSizeWithTextureSize(this._backGroundBoxRenderer.getContentSize());
184182
}, this);
185183
}
186-
this._updateFlippedX();
187-
this._updateFlippedY();
188184

189185
this._updateChildrenDisplayedRGBA();
190186

@@ -210,8 +206,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
210206
this._backGroundSelectedBoxRenderer.addEventListener("load", function(){
211207
self._findLayout();
212208

213-
self._updateFlippedX();
214-
self._updateFlippedY();
215209
self._updateChildrenDisplayedRGBA();
216210
self._backGroundSelectedBoxRendererAdaptDirty = true;
217211
});
@@ -230,8 +224,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
230224
break;
231225
}
232226

233-
this._updateFlippedX();
234-
this._updateFlippedY();
235227

236228
this._updateChildrenDisplayedRGBA();
237229

@@ -255,8 +247,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
255247
this._frontCrossRenderer.addEventListener("load", function(){
256248
self._findLayout();
257249

258-
self._updateFlippedX();
259-
self._updateFlippedY();
260250
self._updateChildrenDisplayedRGBA();
261251
self._frontCrossRendererAdaptDirty = true;
262252
});
@@ -274,8 +264,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
274264
default:
275265
break;
276266
}
277-
this._updateFlippedX();
278-
this._updateFlippedY();
279267

280268
this._updateChildrenDisplayedRGBA();
281269

@@ -299,8 +287,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
299287
this._backGroundBoxDisabledRenderer.addEventListener("load", function(){
300288
self._findLayout();
301289

302-
self._updateFlippedX();
303-
self._updateFlippedY();
304290
self._updateChildrenDisplayedRGBA();
305291
self._backGroundBoxDisabledRendererAdaptDirty = true;
306292
});
@@ -318,8 +304,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
318304
default:
319305
break;
320306
}
321-
this._updateFlippedX();
322-
this._updateFlippedY();
323307

324308
this._updateChildrenDisplayedRGBA();
325309

@@ -343,8 +327,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
343327
this._frontCrossDisabledRenderer.addEventListener("load", function(){
344328
self._findLayout();
345329

346-
self._updateFlippedX();
347-
self._updateFlippedY();
348330
self._updateChildrenDisplayedRGBA();
349331
self._frontCrossDisabledRendererAdaptDirty = true;
350332
});
@@ -362,8 +344,6 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
362344
default:
363345
break;
364346
}
365-
this._updateFlippedX();
366-
this._updateFlippedY();
367347

368348
this._updateChildrenDisplayedRGBA();
369349

0 commit comments

Comments
 (0)