Merge pull request #3225 from sgtcloud/develop

fix the TextAtlas incorrect width setting in the ccs file

Author: pandamicro

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -1061,6 +1061,9 @@
         });
         this.widgetAttributes(widget, json);
 
+        // the TextAtlas must be ignore ContentSize[Size] in the ccs file.
+        widget.ignoreContentAdaptWithSize(true);
+
         return widget;
     };