Skip to content

Commit b724b63

Browse files
xingsenmaxingsenma
committed
issue cocos2d#3251 improve code for cocostudio
1 parent 2b43e17 commit b724b63

File tree

4 files changed

+33
-80
lines changed

4 files changed

+33
-80
lines changed

‎extensions/CocoStudio/GUI/UIWidgets/UIImageView.js‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,34 +76,19 @@ ccs.UIImageView = ccs.UIWidget.extend(/** @lends ccs.UIImageView# */{
7676
this._imageTexType = texType;
7777
switch (this._imageTexType) {
7878
case ccs.TextureResType.local:
79-
if (this._scale9Enabled) {
80-
this._imageRenderer.initWithFile(fileName);
81-
this._imageRenderer.setColor(this.getColor());
82-
this._imageRenderer.setOpacity(this.getOpacity());
83-
this._imageRenderer.setCapInsets(this._capInsets);
84-
}
85-
else {
86-
this._imageRenderer.initWithFile(fileName);
87-
this._imageRenderer.setColor(this.getColor());
88-
this._imageRenderer.setOpacity(this.getOpacity());
89-
}
79+
this._imageRenderer.initWithFile(fileName);
9080
break;
9181
case ccs.TextureResType.plist:
92-
if (this._scale9Enabled) {
93-
this._imageRenderer.initWithSpriteFrameName(fileName);
94-
this._imageRenderer.setColor(this.getColor());
95-
this._imageRenderer.setOpacity(this.getOpacity());
96-
this._imageRenderer.setCapInsets(this._capInsets);
97-
}
98-
else {
99-
this._imageRenderer.initWithSpriteFrameName(fileName);
100-
this._imageRenderer.setColor(this.getColor());
101-
this._imageRenderer.setOpacity(this.getOpacity());
102-
}
82+
this._imageRenderer.initWithSpriteFrameName(fileName);
10383
break;
10484
default:
10585
break;
10686
}
87+
this._imageRenderer.setColor(this.getColor());
88+
this._imageRenderer.setOpacity(this.getOpacity());
89+
if (this._scale9Enabled) {
90+
this._imageRenderer.setCapInsets(this._capInsets);
91+
}
10792
this._imageTextureSize = this._imageRenderer.getContentSize();
10893
this.updateAnchorPoint();
10994
this.imageTextureScaleChangedWithSize();

‎extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -117,32 +117,19 @@ ccs.UILoadingBar = ccs.UIWidget.extend(/** @lends ccs.UILoadingBar# */{
117117
this._textureFile = texture;
118118
switch (this._renderBarTexType) {
119119
case ccs.TextureResType.local:
120-
if (this._scale9Enabled){
121-
this._barRenderer.initWithFile(texture);
122-
this._barRenderer.setCapInsets(this._capInsets);
123-
}
124-
else
125-
this._barRenderer.initWithFile(texture);
120+
this._barRenderer.initWithFile(texture);
126121
break;
127122
case ccs.TextureResType.plist:
128-
if (this._scale9Enabled){
129-
this._barRenderer.initWithSpriteFrameName(texture);
130-
this._barRenderer.setCapInsets(this._capInsets);
131-
}
132-
else
133-
this._barRenderer.initWithSpriteFrameName(texture);
123+
this._barRenderer.initWithSpriteFrameName(texture);
134124
break;
135125
default:
136126
break;
137127
}
138-
if (this._scale9Enabled) {
139-
this._barRenderer.setColor(this.getColor());
140-
this._barRenderer.setOpacity(this.getOpacity());
141-
}
142-
else {
143-
this._barRenderer.setColor(this.getColor());
144-
this._barRenderer.setOpacity(this.getOpacity());
128+
if (this._scale9Enabled){
129+
this._barRenderer.setCapInsets(this._capInsets);
145130
}
131+
this._barRenderer.setColor(this.getColor());
132+
this._barRenderer.setOpacity(this.getOpacity());
146133
this._barRendererTextureSize.width = this._barRenderer.getContentSize().width;
147134
this._barRendererTextureSize.height = this._barRenderer.getContentSize().height;
148135

@@ -220,17 +207,13 @@ ccs.UILoadingBar = ccs.UIWidget.extend(/** @lends ccs.UILoadingBar# */{
220207
var res = this._percent / 100.0;
221208

222209
var x = 0, y = 0;
223-
switch (this._renderBarTexType) {
224-
case ccs.TextureResType.plist:
225-
var barNode = this._barRenderer;
226-
if (barNode) {
227-
var to = barNode.getTextureRect().origin;
228-
x = to.x;
229-
y = to.y;
230-
}
231-
break;
232-
default:
233-
break;
210+
if(this._renderBarTexType==ccs.TextureResType.plist){
211+
var barNode = this._barRenderer;
212+
if (barNode) {
213+
var to = barNode.getTextureRect().origin;
214+
x = to.x;
215+
y = to.y;
216+
}
234217
}
235218
if (this._scale9Enabled)
236219
this.setScale9Scale();

‎extensions/CocoStudio/GUI/UIWidgets/UISlider.js‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,8 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{
129129
default:
130130
break;
131131
}
132-
if (this._scale9Enabled) {
133-
this._barRenderer.setColor(this.getColor());
134-
this._barRenderer.setOpacity(this.getOpacity());
135-
}
136-
else {
137-
this._barRenderer.setColor(this.getColor());
138-
this._barRenderer.setOpacity(this.getOpacity());
139-
}
132+
this._barRenderer.setColor(this.getColor());
133+
this._barRenderer.setOpacity(this.getOpacity());
140134
this.barRendererScaleChangedWithSize();
141135
},
142136

@@ -162,14 +156,8 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{
162156
default:
163157
break;
164158
}
165-
if (this._scale9Enabled) {
166-
this._progressBarRenderer.setColor(this.getColor());
167-
this._progressBarRenderer.setOpacity(this.getOpacity());
168-
}
169-
else {
170-
this._progressBarRenderer.setColor(this.getColor());
171-
this._progressBarRenderer.setOpacity(this.getOpacity());
172-
}
159+
this._progressBarRenderer.setColor(this.getColor());
160+
this._progressBarRenderer.setOpacity(this.getOpacity());
173161
this._progressBarRenderer.setAnchorPoint(cc.p(0.0, 0.5));
174162
var locSize = this._progressBarRenderer.getContentSize();
175163
this._progressBarTextureSize.width = locSize.width;
@@ -369,17 +357,13 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{
369357
}
370358
else {
371359
var x = 0, y = 0;
372-
switch (this._progressBarTexType) {
373-
case ccs.TextureResType.plist:
374-
var barNode = this._progressBarRenderer;
375-
if (barNode) {
376-
var to = barNode.getTextureRect().origin;
377-
x = to.x;
378-
y = to.y;
379-
}
380-
break;
381-
default:
382-
break;
360+
if (this._progressBarTexType == ccs.TextureResType.plist) {
361+
var barNode = this._progressBarRenderer;
362+
if (barNode) {
363+
var to = barNode.getTextureRect().origin;
364+
x = to.x;
365+
y = to.y;
366+
}
383367
}
384368
this._progressBarRenderer.setTextureRect(cc.rect(x, y, this._progressBarTextureSize.width * (percent / 100.0), this._progressBarTextureSize.height));
385369
}

‎extensions/CocoStudio/Reader/GUIReader.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({
278278
var x = options["x"];
279279
var y = options["y"];
280280
widget.setPosition(cc.p(x, y));
281-
;
282281
if (options.hasOwnProperty("scaleX")) {
283282
widget.setScaleX(options["scaleX"]);
284283
}
@@ -1126,6 +1125,8 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({
11261125
}
11271126
frontCrossDisabledDic = null;
11281127

1128+
var selectedState = options["selectedState"] || false;
1129+
widget.setSelectedState(selectedState);
11291130
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
11301131
},
11311132

0 commit comments

Comments
 (0)