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

add uploading switch scale9 tests

This commit is contained in:
andyque 2015-01-26 13:49:54 +08:00
parent ebc75579a2
commit fdbf84a118
7 changed files with 113 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/ui/UILoadingBar.cpp
View File

@ -216,7 +216,7 @@ void LoadingBar::setScale9Enabled(bool enabled)
ignoreContentAdaptWithSize(_prevIgnoreSize);
}
setCapInsets(_capInsets);
setPercent(_percent);
this->setPercent(_percent);
_barRendererAdaptDirty = true;
}
@ -255,18 +255,24 @@ void LoadingBar::setPercent(float percent)
return;
}
_percent = percent;
if (_totalLength <= 0)
{
return;
}
float res = _percent / 100.0f;
this->updateProgressBar();
}
void LoadingBar::updateProgressBar()
{
if (_scale9Enabled)
{
setScale9Scale();
}
else
{
float res = _percent / 100.0f;
Sprite* spriteRenderer = _barRenderer->getSprite();
Rect rect = spriteRenderer->getTextureRect();
rect.size.width = _barRendererTextureSize.width * res;
@ -334,7 +340,7 @@ void LoadingBar::barRendererScaleChangedWithSize()
_totalLength = _contentSize.width;
if (_scale9Enabled)
{
setScale9Scale();
this->setScale9Scale();
_barRenderer->setScale(1.0f);
}
else

1
cocos/ui/UILoadingBar.h
View File

@ -148,6 +148,7 @@ protected:
virtual void onSizeChanged() override;
void setScale9Scale();
void updateProgressBar();
void barRendererScaleChangedWithSize();
virtual void adaptRenderers() override;

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

@ -139,7 +139,7 @@ g_guisTests[] =
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
sceneManager->setCurrentUISceneId(kUILoadingBarTest_Left);
sceneManager->setMinUISceneId(kUILoadingBarTest_Left);
sceneManager->setMaxUISceneId(kUILoadingBarTest_Right_Scale9);
sceneManager->setMaxUISceneId(kUILoadingBarReloadTexture);
Scene* scene = sceneManager->currentUIScene();
Director::getInstance()->replaceScene(scene);
}

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

@ -396,4 +396,87 @@ bool UILoadingBarTest_Scale9_State_Change::init()
return true;
}
return false;
}
// UILoadingBarReloadTexture
UILoadingBarReloadTexture::UILoadingBarReloadTexture()
: _count(0)
{
}
UILoadingBarReloadTexture::~UILoadingBarReloadTexture()
{
}
bool UILoadingBarReloadTexture::init()
{
if (UIScene::init())
{
Size widgetSize = _widget->getContentSize();
// Add the alert
Text *alert = Text::create("LoadingBar right scale9 render", "fonts/Marker Felt.ttf", 20);
alert->setColor(Color3B(159, 168, 176));
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
_uiLayer->addChild(alert);
LoadingBar* loadingBar = LoadingBar::create("cocosui/slider_bar_active_9patch.png");
loadingBar->setTag(0);
loadingBar->ignoreContentAdaptWithSize(false);
loadingBar->setScale9Enabled(true);
loadingBar->setCapInsets(Rect(0, 0, 0, 0));
loadingBar->setContentSize(Size(300, 13));
loadingBar->setName("texture0");
loadingBar->setDirection(LoadingBar::Direction::RIGHT);
loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
_uiLayer->addChild(loadingBar);
auto buttonScale9 = Button::create();
buttonScale9->setTitleText("ToggleScale9");
buttonScale9->addClickEventListener([=](Ref*){
loadingBar->setScale9Enabled(!loadingBar->isScale9Enabled());
});
buttonScale9->setPosition(loadingBar->getPosition() + Vec2(-50,50));
_uiLayer->addChild(buttonScale9);
auto buttonChangeTexture = Button::create();
buttonChangeTexture->setTitleText("ChangeTexture");
buttonChangeTexture->addClickEventListener([=](Ref*){
auto name = loadingBar->getName();
if (name == "texture0")
{
loadingBar->loadTexture("cocosui/slider_bar_active_9patch2.png");
loadingBar->setName("texture1");
}
else
{
loadingBar->loadTexture("cocosui/slider_bar_active_9patch.png");
loadingBar->setName("texture0");
}
});
buttonChangeTexture->setPosition(loadingBar->getPosition() + Vec2(50,50));
_uiLayer->addChild(buttonChangeTexture);
this->scheduleUpdate();
return true;
}
return false;
}
void UILoadingBarReloadTexture::update(float delta)
{
_count++;
if (_count > 100)
{
_count = 0;
}
LoadingBar* loadingBar = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
loadingBar->setPercent(_count);
}

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

@ -104,7 +104,21 @@ public:
protected:
UI_SCENE_CREATE_FUNC(UILoadingBarTest_Scale9_State_Change)
int _count;
int _count;
};
class UILoadingBarReloadTexture : public UIScene
{
public:
UILoadingBarReloadTexture();
~UILoadingBarReloadTexture();
void update(float dt);
bool init();
protected:
UI_SCENE_CREATE_FUNC(UILoadingBarReloadTexture);
int _count;
};
#endif /* defined(__TestCpp__UILoadingBarTest__) */

3
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
View File

@ -71,6 +71,7 @@ static const char* s_testArray[] =
"UILoadingBarTest_Scale9_State_Change",
"UILoadingBarTest_Left_Scale9",
"UILoadingBarTest_Right_Scale9",
"UILoadingBarReloadTexture",
"UITextAtlasTest",
"UITextTest",
@ -284,6 +285,8 @@ Scene *UISceneManager::currentUIScene()
case kUILoadingBarTest_Right_Scale9:
return UILoadingBarTest_Right_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUILoadingBarReloadTexture:
return UILoadingBarReloadTexture::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUITextAtlasTest:
return UITextAtlasTest::sceneWithTitle(s_testArray[_currentUISceneId]);

1
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
View File

@ -66,6 +66,7 @@ enum
kUILoadingBarTest_Scale9_State_Change,
kUILoadingBarTest_Left_Scale9,
kUILoadingBarTest_Right_Scale9,
kUILoadingBarReloadTexture,
kUITextAtlasTest,
kUITextTest,
kUITextTest_LineWrap,