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

Merge pull request #7712 from andyque/testLoadingBar 

fixed loadingBar change direction affect position issue
This commit is contained in:
minggo 2014-08-08 11:57:28 +08:00
parent ad9eb7ca8d d00e3349a3
commit 3ccce066b0
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/ui/UILoadingBar.cpp
View File

@ -100,14 +100,14 @@ void LoadingBar::setDirection(cocos2d::ui::LoadingBar::Direction direction)
{ {
case Direction::LEFT: case Direction::LEFT:
_barRenderer->setAnchorPoint(Vec2(0.0f,0.5f)); _barRenderer->setAnchorPoint(Vec2(0.0f,0.5f));
_barRenderer->setPosition(Vec2(-_totalLength*0.5f,0.0f)); _barRenderer->setPosition(Vec2(0,0.0f));
if (!_scale9Enabled) { if (!_scale9Enabled) {
_barRenderer->setFlippedX(false); _barRenderer->setFlippedX(false);
} }
break; break;
case Direction::RIGHT: case Direction::RIGHT:
_barRenderer->setAnchorPoint(Vec2(1.0f,0.5f)); _barRenderer->setAnchorPoint(Vec2(1.0f,0.5f));
_barRenderer->setPosition(Vec2(_totalLength*0.5f,0.0f)); _barRenderer->setPosition(Vec2(_totalLength,0.0f));
if (!_scale9Enabled) { if (!_scale9Enabled) {
_barRenderer->setFlippedX(true); _barRenderer->setFlippedX(true);
} }

16
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
View File

@ -35,7 +35,21 @@ bool UILoadingBarTest_Left::init()
loadingBar->setTag(0); loadingBar->setTag(0);
loadingBar->setPosition(Vec2(widgetSize.width / 2.0f, loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f)); widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
Button* button = Button::create("cocosui/animationbuttonnormal.png",
"cocosui/animationbuttonpressed.png");
button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
button->setTitleText("Click to change direction!");
// button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent));
button->addTouchEventListener([=](Ref*, Widget::TouchEventType type){
if (type == Widget::TouchEventType::ENDED) {
if (loadingBar->getDirection() == LoadingBar::Direction::LEFT) {
loadingBar->setDirection(LoadingBar::Direction::RIGHT);
}else{
loadingBar->setDirection(LoadingBar::Direction::LEFT);
}
}
});
_uiLayer->addChild(button);
_uiLayer->addChild(loadingBar); _uiLayer->addChild(loadingBar);
return true; return true;