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

Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8 

[ci skip]add missing ui test in Lua
This commit is contained in:
子龙山人 2015-08-20 15:28:25 +08:00
parent 13a271d96d 72496ae426
commit f79d2c8a0a
5 changed files with 2998 additions and 4320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua
View File

@ -619,3 +619,10 @@ cc.AsyncTaskPool.TaskType =
TASK_MAX_TYPE = 3,
}
cc.RED = cc.c3b(255,0,0)
cc.GREEN = cc.c3b(0,255,0)
cc.BLUE = cc.c3b(0,0,255)
cc.BLACK = cc.c3b(0,0,0)
cc.WHITE = cc.c3b(255,255,255)
cc.YELLOW = cc.c3b(255,255,0)

7
cocos/scripting/lua-bindings/script/ui/GuiConstants.lua
View File

@ -107,7 +107,12 @@ ccui.RelativeAlign =
locationBelowRightAlign = 21,
}
ccui.SliderEventType = {percentChanged = 0}
ccui.SliderEventType = {
percentChanged = 0,
slideBallDown = 1,
slideBallUp = 2,
slideBallCancel = 3
}
ccui.LoadingBarDirection = { LEFT = 0, RIGHT = 1}

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.cpp
View File

@ -99,7 +99,7 @@ void UIRadioButtonTest::addRadioButton(Ref* sender)
}
RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
pos.x += + BUTTON_WIDTH;
pos.x += BUTTON_WIDTH;
radioButton->setPosition(pos);
_radioButtonGroup->addRadioButton(radioButton);
_uiLayer->addChild(radioButton);

7300
tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua
View File

File diff suppressed because it is too large Load Diff

2
tools/tolua/cocos2dx_ui.ini
View File

@ -30,7 +30,7 @@ headers = %(cocosdir)s/cocos/ui/CocosGUI.h
# what classes to produce code for. You can use regular expressions here. When testing the regular
# expression, it will be enclosed in "^$", like this: "^Menu*$".
classes = Helper Widget Layout Button CheckBox ImageView Text TextAtlas TextBMFont LoadingBar Slider TextField ScrollView ListView PageView LayoutParameter LinearLayoutParameter RelativeLayoutParameter Rich.* HBox VBox RelativeBox Scale9Sprite EditBox LayoutComponent AbstractCheckButton
classes = Helper Widget Layout Button CheckBox ImageView Text TextAtlas TextBMFont LoadingBar Slider TextField ScrollView ListView PageView LayoutParameter LinearLayoutParameter RelativeLayoutParameter Rich.* HBox VBox RelativeBox Scale9Sprite EditBox LayoutComponent AbstractCheckButton RadioButton RadioButtonGroup
# what should we skip? in the format ClassName::[function function]
# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also