Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10733 from pipu/modify_layout_attribute_name 

To modify layout attribute name that are used in serialized and parsed.
This commit is contained in:
minggo 2015-03-06 15:00:33 +08:00
parent 065102ae7c be1b0b7239
commit c96f3b135a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp
View File

@ -36,10 +36,10 @@ using namespace flatbuffers;
namespace cocostudio
{
const char* Layout_PositionPercentXEnabled = "PositionPercentXEnable";
const char* Layout_PositionPercentYEnabled = "PositionPercentYEnable";
const char* Layout_PercentWidthEnable = "PercentWidthEnable";
const char* Layout_PercentHeightEnable = "PercentHeightEnable";
const char* Layout_PositionPercentXEnabled = "PositionPercentXEnabled";
const char* Layout_PositionPercentYEnabled = "PositionPercentYEnabled";
const char* Layout_PercentWidthEnable = "PercentWidthEnabled";
const char* Layout_PercentHeightEnable = "PercentHeightEnabled";
const char* Layout_StretchWidthEnable = "StretchWidthEnable";
const char* Layout_StretchHeightEnable = "StretchHeightEnable";
const char* Layout_HorizontalEdge = "HorizontalEdge";

8
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -67,10 +67,10 @@ namespace cocostudio
const char* P_ResourceType = "resourceType";
const char* P_Path = "path";
const char* P_Layout_PositionPercentXEnabled = "PositionPercentXEnable";
const char* P_Layout_PositionPercentYEnabled = "PositionPercentYEnable";
const char* P_Layout_PercentWidthEnable = "PercentWidthEnable";
const char* P_Layout_PercentHeightEnable = "PercentHeightEnable";
const char* P_Layout_PositionPercentXEnabled = "PositionPercentXEnabled";
const char* P_Layout_PositionPercentYEnabled = "PositionPercentYEnabled";
const char* P_Layout_PercentWidthEnable = "PercentWidthEnabled";
const char* P_Layout_PercentHeightEnable = "PercentHeightEnabled";
const char* P_Layout_StretchWidthEnable = "StretchWidthEnable";
const char* P_Layout_StretchHeightEnable = "StretchHeightEnable";
const char* P_Layout_HorizontalEdge = "HorizontalEdge";