Skip to content

Commit 4c14b07

Browse files
dingpinglvdingpinglv
committed
Issue #3433: replace setContentSize(cc.size(w,h)) to setContentSize(w,h)
1 parent 0770b47 commit 4c14b07

File tree

17 files changed

+42
-42
lines changed

17 files changed

+42
-42
lines changed

‎games/MoonWarriors/src/GameOver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var GameOver = cc.Layer.extend({
66
var bRet = false;
77
if (this._super()) {
88
var sp = cc.Sprite.create(s_loading);
9-
sp.setAnchorPoint( cc.p(0,0) );
9+
sp.setAnchorPoint(0,0);
1010
this.addChild(sp, 0, 1);
1111

1212
var logo = cc.Sprite.create(s_gameOver);

‎games/WatermelonWithMe/watermelon_with_me.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ var GameLayer = cc.LayerGradient.extend({
679679
var sprite = cc.PhysicsSprite.createWithSpriteFrameName("Chassis.png");
680680
var anchor = cp.v.add( sprite.getAnchorPointInPoints(), COG_ADJUSTMENT );
681681
var cs = sprite.getContentSize();
682-
sprite.setAnchorPoint( cc.p(anchor.x / cs.width, anchor.y/cs.height) );
682+
sprite.setAnchorPoint(anchor.x / cs.width, anchor.y/cs.height);
683683

684684
// XXX: Space Patrol uses a nice poly for the chassis.
685685
// XXX: Add something similar here, instead of a boxed chassis

‎tests/ActionsTest/ActionsTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,13 +463,13 @@ var ActionSkewRotateScale = ActionsDemo.extend({
463463
var markrside = 10.0;
464464
var uL = cc.LayerColor.create(cc.c4b(255, 0, 0, 255));
465465
box.addChild(uL);
466-
uL.setContentSize(cc.size(markrside, markrside));
466+
uL.setContentSize(markrside, markrside);
467467
uL.setPosition(0, boxSize.height - markrside);
468468
uL.setAnchorPoint(0, 0);
469469

470470
var uR = cc.LayerColor.create(cc.c4b(0, 0, 255, 255));
471471
box.addChild(uR);
472-
uR.setContentSize(cc.size(markrside, markrside));
472+
uR.setContentSize(markrside, markrside);
473473
uR.setPosition(boxSize.width - markrside, boxSize.height - markrside);
474474
uR.setAnchorPoint(0, 0);
475475

‎tests/ChipmunkTest/ChipmunkTest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,9 @@ var ChipmunkSpriteAnchorPoint = function() {
561561
var sprite2 = this.createPhysicsSprite( cp.v(winSize.width/4*2, winSize.height/2) );
562562
var sprite3 = this.createPhysicsSprite( cp.v(winSize.width/4*3, winSize.height/2) );
563563

564-
sprite1.setAnchorPoint( cc.p(0,0) );
565-
sprite2.setAnchorPoint( cc.p(0.5,0.5) );
566-
sprite3.setAnchorPoint( cc.p(1,1) );
564+
sprite1.setAnchorPoint(0,0);
565+
sprite2.setAnchorPoint(0.5,0.5);
566+
sprite3.setAnchorPoint(1,1);
567567

568568
// scale sprite
569569
var scaledown = cc.ScaleBy.create(0.5, 0.5);

‎tests/ClippingNodeTest/ClippingNodeTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ var NestedTest = BaseClippingNodeTest.extend({
252252
var size = 225 - i * (225 / (depth * 2));
253253

254254
var clipper = cc.ClippingNode.create();
255-
clipper.setContentSize(cc.size(size, size));
255+
clipper.setContentSize(size, size);
256256
clipper.setAnchorPoint(0.5, 0.5);
257257
clipper.setPosition(cc.p(parent.getContentSize().width / 2, parent.getContentSize().height / 2));
258258
clipper.setAlphaThreshold(0.05);
@@ -371,7 +371,7 @@ var ScrollViewDemo = BaseClippingNodeTest.extend({
371371
setup:function () {
372372
var clipper = cc.ClippingNode.create();
373373
clipper.setTag(TAG_CLIPPERNODE);
374-
clipper.setContentSize(cc.size(200, 200));
374+
clipper.setContentSize(200, 200);
375375
clipper.setAnchorPoint(0.5, 0.5);
376376
clipper.setPosition(cc.p(this.getContentSize().width / 2, this.getContentSize().height / 2));
377377
clipper.runAction(cc.RepeatForever.create(cc.RotateBy.create(1, 45)));

‎tests/CocosDenshionTest/CocosDenshionTest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ CocosDenshionTest = cc.LayerGradient.extend({
178178
//add back
179179
var btn_bk = cc.Scale9Sprite.createWithSpriteFrameName("music_btn_bk.png");
180180
btn_bk.setPosition(winSize.width/2, winSize.height*0.45);
181-
btn_bk.setContentSize(cc.size(winSize.width*0.75, winSize.height*0.17));
181+
btn_bk.setContentSize(winSize.width*0.75, winSize.height*0.17);
182182
this._musicPart.addChild(btn_bk);
183183

184184
var oneItems = [
@@ -237,7 +237,7 @@ CocosDenshionTest = cc.LayerGradient.extend({
237237
//add back
238238
var btn_bk = cc.Scale9Sprite.createWithSpriteFrameName("effect_btn_bk.png");
239239
btn_bk.setPosition(cc.p(winSize.width/2, winSize.height*0.46));
240-
btn_bk.setContentSize(cc.size(winSize.width*0.80, winSize.height*0.145));
240+
btn_bk.setContentSize(winSize.width*0.80, winSize.height*0.145);
241241
btn_bk.setScale(this._scale);
242242
this._effectPart.addChild(btn_bk);
243243
var oneItems = [
@@ -281,7 +281,7 @@ CocosDenshionTest = cc.LayerGradient.extend({
281281
for (var i=0; i<twoItems.length/2; i++) {
282282
//add button background.
283283
var two_btn_bk = cc.Scale9Sprite.createWithSpriteFrameName("effect_long_bk.png");
284-
two_btn_bk.setContentSize(cc.size(b_w, b_h));
284+
two_btn_bk.setContentSize(b_w, b_h);
285285
two_btn_bk.setPosition(cc.p(x + w*i, y));
286286
//two_btn_bk->setScale(_scale);
287287
this._effectPart.addChild(two_btn_bk);

‎tests/CocosNodeTest/CocosNodeTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ var StressTest1 = TestNodeDemo.extend({
313313

314314
var sp1 = cc.Sprite.create(s_pathSister1);
315315
this.addChild(sp1, 0, TAG_SPRITE1);
316-
this.setContentSize(cc.size(0, 0));
316+
this.setContentSize(0, 0);
317317

318318
sp1.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
319319

‎tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ var ControlButtonTest_HelloVariableSize = ControlScene.extend({
6666
}
6767

6868
layer.setAnchorPoint(0.5, 0.5);
69-
layer.setContentSize(cc.size(total_width, height));
69+
layer.setContentSize(total_width, height);
7070
layer.setPosition(cc.p(screenSize.width / 2.0, screenSize.height / 2.0));
7171

7272
// Add the black background
7373
var background = cc.Scale9Sprite.create(s_extensions_buttonBackground);
74-
background.setContentSize(cc.size(total_width + 14, height + 14));
74+
background.setContentSize(total_width + 14, height + 14);
7575
background.setPosition(cc.p(screenSize.width / 2.0, screenSize.height / 2.0));
7676
this.addChild(background);
7777
return true;
@@ -136,7 +136,7 @@ var ControlButtonTest_Event = ControlScene.extend({
136136

137137
// Add the black background
138138
var background = cc.Scale9Sprite.create(s_extensions_buttonBackground);
139-
background.setContentSize(cc.size(300, 170));
139+
background.setContentSize(300, 170);
140140
background.setPosition(cc.p(screenSize.width / 2.0, screenSize.height / 2.0));
141141
this.addChild(background);
142142

@@ -224,12 +224,12 @@ var ControlButtonTest_Styling = ControlScene.extend({
224224
}
225225

226226
layer.setAnchorPoint(0.5, 0.5);
227-
layer.setContentSize(cc.size(max_w, max_h));
227+
layer.setContentSize(max_w, max_h);
228228
layer.setPosition(cc.p(screenSize.width / 2.0, screenSize.height / 2.0));
229229

230230
// Add the black background
231231
var backgroundButton = cc.Scale9Sprite.create(s_extensions_buttonBackground);
232-
backgroundButton.setContentSize(cc.size(max_w + 14, max_h + 14));
232+
backgroundButton.setContentSize(max_w + 14, max_h + 14);
233233
backgroundButton.setPosition(cc.p(screenSize.width / 2.0, screenSize.height / 2.0));
234234
this.addChild(backgroundButton);
235235
return true;

‎tests/ExtensionsTest/ControlExtensionTest/CCControlColourPickerTest/CCControlColourPickerTest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var ControlColourPickerTest = ControlScene.extend({
5252

5353
// Add the black background for the text
5454
var background = cc.Scale9Sprite.create("res/extensions/buttonBackground.png");
55-
background.setContentSize(cc.size(150, 50));
55+
background.setContentSize(150, 50);
5656
background.setPosition(cc.p(layer_width + background.getContentSize().width / 2.0, 0));
5757
layer.addChild(background);
5858

@@ -65,8 +65,8 @@ var ControlColourPickerTest = ControlScene.extend({
6565
layer.addChild(this._colorLabel);
6666

6767
// Set the layer size
68-
layer.setContentSize(cc.size(layer_width, 0));
69-
layer.setAnchorPoint(cc.p (0.5, 0.5));
68+
layer.setContentSize(layer_width, 0);
69+
layer.setAnchorPoint(0.5, 0.5);
7070

7171
// Update the color text
7272
this.colourValueChanged(colourPicker, cc.CONTROL_EVENT_VALUECHANGED);

‎tests/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var ControlPotentiometerTest = ControlScene.extend({
3838

3939
// Add the black background for the text
4040
var background = cc.Scale9Sprite.create("res/extensions/buttonBackground.png");
41-
background.setContentSize(cc.size(80, 50));
41+
background.setContentSize(80, 50);
4242
background.setPosition(cc.p(layer_width + background.getContentSize().width / 2.0, 0));
4343
layer.addChild(background);
4444

@@ -63,7 +63,7 @@ var ControlPotentiometerTest = ControlScene.extend({
6363
layer_width += potentiometer.getContentSize().width;
6464

6565
// Set the layer size
66-
layer.setContentSize(cc.size(layer_width, 0));
66+
layer.setContentSize(layer_width, 0);
6767
layer.setAnchorPoint(0.5, 0.5);
6868

6969
// Update the value label

‎tests/ExtensionsTest/ControlExtensionTest/CCControlScene.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var ControlScene = cc.Layer.extend({
5151

5252
// Add the ribbon
5353
var ribbon = cc.Scale9Sprite.create(s_extensions_ribbon, cc.rect(1, 1, 48, 55));
54-
ribbon.setContentSize(cc.size(screensize.width, 57));
54+
ribbon.setContentSize(screensize.width, 57);
5555
ribbon.setPosition(cc.p(screensize.width / 2.0, screensize.height - ribbon.getContentSize().height / 2.0));
5656
this.addChild(ribbon);
5757

‎tests/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var ControlStepperTest = ControlScene.extend({
3636

3737
// Add the black background for the text
3838
var background = cc.Scale9Sprite.create("res/extensions/buttonBackground.png");
39-
background.setContentSize(cc.size(100, 50));
39+
background.setContentSize(100, 50);
4040
background.setPosition(cc.p(layer_width + background.getContentSize().width / 2.0, 0));
4141
layer.addChild(background);
4242

@@ -55,7 +55,7 @@ var ControlStepperTest = ControlScene.extend({
5555
layer_width += stepper.getContentSize().width;
5656

5757
// Set the layer size
58-
layer.setContentSize(cc.size(layer_width, 0));
58+
layer.setContentSize(layer_width, 0);
5959
layer.setAnchorPoint(0.5, 0.5);
6060

6161
// Update the value label

‎tests/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var ControlSwitchTest = ControlScene.extend({
3737

3838
// Add the black background for the text
3939
var background = cc.Scale9Sprite.create("res/extensions/buttonBackground.png");
40-
background.setContentSize(cc.size(80, 50));
40+
background.setContentSize(80, 50);
4141
background.setPosition(cc.p(layer_width + background.getContentSize().width / 2.0, 0));
4242
layer.addChild(background);
4343

@@ -65,7 +65,7 @@ var ControlSwitchTest = ControlScene.extend({
6565
switchControl.addTargetWithActionForControlEvents(this, this.valueChanged, cc.CONTROL_EVENT_VALUECHANGED);
6666

6767
// Set the layer size
68-
layer.setContentSize(cc.size(layer_width, 0));
68+
layer.setContentSize(layer_width, 0);
6969
layer.setAnchorPoint(0.5, 0.5);
7070

7171
// Update the value label

‎tests/ExtensionsTest/S9SpriteTest/S9SpriteTest.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ var S9BatchNodeScaledNoInsets = S9SpriteTestDemo.extend({
210210
blocks_scaled.setPosition(cc.p(x, y));
211211
cc.log("... setPosition");
212212

213-
blocks_scaled.setContentSize(cc.size(96 * 4, 96*2));
213+
blocks_scaled.setContentSize(96 * 4, 96*2);
214214
cc.log("... setContentSize");
215215

216216
this.addChild(blocks_scaled);
@@ -241,7 +241,7 @@ var S9FrameNameSpriteSheetScaledNoInsets = S9SpriteTestDemo.extend({
241241
blocks_scaled.setPosition(cc.p(x, y));
242242
cc.log("... setPosition");
243243

244-
blocks_scaled.setContentSize(cc.size(96 * 4, 96*2));
244+
blocks_scaled.setContentSize(96 * 4, 96*2);
245245
cc.log("... setContentSize");
246246

247247
this.addChild(blocks_scaled);
@@ -272,7 +272,7 @@ var S9FrameNameSpriteSheetRotatedScaledNoInsets = S9SpriteTestDemo.extend({
272272
blocks_scaled.setPosition(cc.p(x, y));
273273
cc.log("... setPosition");
274274

275-
blocks_scaled.setContentSize(cc.size(96 * 4, 96*2));
275+
blocks_scaled.setContentSize(96 * 4, 96*2);
276276
cc.log("... setContentSize");
277277

278278
this.addChild(blocks_scaled);
@@ -307,7 +307,7 @@ var S9BatchNodeScaleWithCapInsets = S9SpriteTestDemo.extend({
307307
blocks_scaled_with_insets.updateWithBatchNode(batchNode_scaled_with_insets, cc.rect(0, 0, 96, 96), false, cc.rect(32, 32, 32, 32));
308308
cc.log("... updateWithBatchNode");
309309

310-
blocks_scaled_with_insets.setContentSize(cc.size(96 * 4.5, 96 * 2.5));
310+
blocks_scaled_with_insets.setContentSize(96 * 4.5, 96 * 2.5);
311311
cc.log("... setContentSize");
312312

313313
blocks_scaled_with_insets.setPosition(cc.p(x, y));
@@ -366,7 +366,7 @@ var S9FrameNameSpriteSheetInsetsScaled = S9SpriteTestDemo.extend({
366366
var blocks_scaled_with_insets = cc.Scale9Sprite.createWithSpriteFrameName('blocks9.png', cc.rect(32, 32, 32, 32));
367367
cc.log("... created");
368368

369-
blocks_scaled_with_insets.setContentSize(cc.size(96 * 4.5, 96 * 2.5));
369+
blocks_scaled_with_insets.setContentSize(96 * 4.5, 96 * 2.5);
370370
cc.log("... setContentSize");
371371

372372
blocks_scaled_with_insets.setPosition(cc.p(x, y));
@@ -429,7 +429,7 @@ var S9_TexturePacker = S9SpriteTestDemo.extend({
429429
s.setPosition(cc.p(x, y));
430430
cc.log("... setPosition");
431431

432-
s.setContentSize(cc.size(21 * 16, 13 * 16));
432+
s.setContentSize(21 * 16, 13 * 16);
433433
cc.log("... setContentSize");
434434

435435
this.addChild(s);
@@ -443,7 +443,7 @@ var S9_TexturePacker = S9SpriteTestDemo.extend({
443443
s2.setPosition(cc.p(x, y));
444444
cc.log("... setPosition");
445445

446-
s2.setContentSize(cc.size(21 * 16, 13 * 16));
446+
s2.setContentSize(21 * 16, 13 * 16);
447447
cc.log("... setContentSize");
448448

449449
this.addChild(s2);
@@ -471,7 +471,7 @@ var S9FrameNameSpriteSheetRotatedInsetsScaled = S9SpriteTestDemo.extend({
471471
var blocks_scaled_with_insets = cc.Scale9Sprite.createWithSpriteFrameName('blocks9.png', cc.rect(32, 32, 32, 32));
472472
cc.log("... created");
473473

474-
blocks_scaled_with_insets.setContentSize(cc.size(96 * 4.5, 96 * 2.5));
474+
blocks_scaled_with_insets.setContentSize(96 * 4.5, 96 * 2.5);
475475
cc.log("... setContentSize");
476476

477477
blocks_scaled_with_insets.setPosition(cc.p(x, y));

‎tests/OpenGLTest/OpenGLTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ var ShaderNode = cc.GLNode.extend({
552552
this.init();
553553

554554
if( 'opengl' in sys.capabilities ) {
555-
this.setContentSize(cc.size(256,256));
555+
this.setContentSize(256,256);
556556
this.setAnchorPoint(0.5, 0.5);
557557

558558
this.shader = cc.GLProgram.create(vertexShader, framentShader);
@@ -949,7 +949,7 @@ var TexImage2DTest = OpenGLTestLayer.extend({
949949
this.addChild(glnode,10);
950950
this.glnode = glnode;
951951
glnode.setPosition(winSize.width/2, winSize.height/2);
952-
glnode.setContentSize(cc.size(128,128));
952+
glnode.setContentSize(128,128);
953953
glnode.setAnchorPoint(0.5,0.5);
954954

955955
this.shader = cc.ShaderCache.getInstance().getProgram("ShaderPositionTexture");

‎tests/SpriteTest/SpriteTest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ var SpriteZVertex = SpriteTestDemo.extend({
930930

931931
var node = cc.Node.create();
932932
// camera uses the center of the image as the pivoting point
933-
node.setContentSize(cc.size(winSize.width, winSize.height));
933+
node.setContentSize(winSize.width, winSize.height);
934934
node.setAnchorPoint(0.5, 0.5);
935935
node.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
936936

@@ -1043,7 +1043,7 @@ var SpriteBatchNodeZVertex = SpriteTestDemo.extend({
10431043
// Don't use capacity=1 in your real game. It is expensive to resize the capacity
10441044
var batch = cc.SpriteBatchNode.create(s_grossini_dance_atlas, 1);
10451045
// camera uses the center of the image as the pivoting point
1046-
batch.setContentSize(cc.size(winSize.width, winSize.height));
1046+
batch.setContentSize(winSize.width, winSize.height);
10471047
batch.setAnchorPoint(0.5, 0.5);
10481048
batch.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
10491049
batch.setShaderProgram(alphaTestShader);
@@ -1253,7 +1253,7 @@ var Sprite6 = SpriteTestDemo.extend({
12531253
batch.ignoreAnchorPointForPosition(true);
12541254

12551255
batch.setAnchorPoint(0.5, 0.5);
1256-
batch.setContentSize(cc.size(winSize.width, winSize.height));
1256+
batch.setContentSize(winSize.width, winSize.height);
12571257

12581258
// SpriteBatchNode actions
12591259
var rotate1 = cc.RotateBy.create(5, 360);

‎tests/tests-main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ var TestController = cc.LayerGradient.extend({
129129
}
130130
}
131131

132-
this._itemMenu.setContentSize(cc.size(winSize.width, (testNames.length + 1) * LINE_SPACE));
132+
this._itemMenu.setContentSize(winSize.width, (testNames.length + 1) * LINE_SPACE);
133133
this._itemMenu.setPosition(curPos);
134134
this.addChild(this._itemMenu);
135135
this.addChild(menu, 1);

0 commit comments

Comments
 (0)