- moved progress bar beside return button
This commit is contained in:
parent
98a3c5e699
commit
a12e9787e1
|
@ -4648,7 +4648,8 @@ void Renderer::renderArrow(const Vec3f &pos1, const Vec3f &pos2,
|
||||||
glEnd();
|
glEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int customWidth, string prefixLabel) {
|
void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int customWidth,
|
||||||
|
string prefixLabel,bool centeredText) {
|
||||||
|
|
||||||
int currentSize = size;
|
int currentSize = size;
|
||||||
int maxSize = maxProgressBar;
|
int maxSize = maxProgressBar;
|
||||||
|
@ -4658,6 +4659,9 @@ void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int custo
|
||||||
currentSize = (int)((double)customWidth * ((double)size / 100.0));
|
currentSize = (int)((double)customWidth * ((double)size / 100.0));
|
||||||
}
|
}
|
||||||
maxSize = customWidth;
|
maxSize = customWidth;
|
||||||
|
if(maxSize <= 0) {
|
||||||
|
maxSize = maxProgressBar;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(prefixLabel != "") {
|
if(prefixLabel != "") {
|
||||||
renderText = prefixLabel + renderText;
|
renderText = prefixLabel + renderText;
|
||||||
|
@ -4688,7 +4692,12 @@ void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int custo
|
||||||
//text
|
//text
|
||||||
glColor3fv(defColor.ptr());
|
glColor3fv(defColor.ptr());
|
||||||
textRenderer->begin(font);
|
textRenderer->begin(font);
|
||||||
textRenderer->render(renderText.c_str(), x + maxSize / 2, y, true);
|
if(centeredText == true) {
|
||||||
|
textRenderer->render(renderText.c_str(), x + maxSize / 2, y, centeredText);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
textRenderer->render(renderText.c_str(), x, y, centeredText);
|
||||||
|
}
|
||||||
textRenderer->end();
|
textRenderer->end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -433,7 +433,7 @@ public:
|
||||||
|
|
||||||
Texture2D *saveScreenToTexture(int x, int y, int width, int height);
|
Texture2D *saveScreenToTexture(int x, int y, int width, int height);
|
||||||
|
|
||||||
void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel="");
|
void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel="", bool centeredText=true);
|
||||||
|
|
||||||
static Texture2D * findFactionLogoTexture(string logoFilename);
|
static Texture2D * findFactionLogoTexture(string logoFilename);
|
||||||
static Texture2D * preloadTexture(string logoFilename);
|
static Texture2D * preloadTexture(string logoFilename);
|
||||||
|
|
|
@ -1660,6 +1660,9 @@ void MenuStateMods::showDesription(const ModInfo *modInfo) {
|
||||||
if(modInfo->imageUrl != "") {
|
if(modInfo->imageUrl != "") {
|
||||||
cleanupPreviewTexture();
|
cleanupPreviewTexture();
|
||||||
string tempImage = getPreviewImageFileForMod(modInfo);
|
string tempImage = getPreviewImageFileForMod(modInfo);
|
||||||
|
|
||||||
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### tempImage [%s] exists [%d]\n",tempImage.c_str(),fileExists(tempImage));
|
||||||
|
|
||||||
if(tempImage != "" && fileExists(tempImage) == false) {
|
if(tempImage != "" && fileExists(tempImage) == false) {
|
||||||
if(ftpClientThread != NULL) ftpClientThread->addFileToRequests(tempImage,modInfo->imageUrl);
|
if(ftpClientThread != NULL) ftpClientThread->addFileToRequests(tempImage,modInfo->imageUrl);
|
||||||
|
|
||||||
|
@ -1885,6 +1888,7 @@ void MenuStateMods::render() {
|
||||||
if(ftpClientThread != NULL && ftpClientThread->getProgressMutex() != NULL) ftpClientThread->getProgressMutex()->setOwnerId(mutexOwnerId);
|
if(ftpClientThread != NULL && ftpClientThread->getProgressMutex() != NULL) ftpClientThread->getProgressMutex()->setOwnerId(mutexOwnerId);
|
||||||
if(fileFTPProgressList.size() > 0) {
|
if(fileFTPProgressList.size() > 0) {
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
|
int xLocation = buttonReturn.getX() + buttonReturn.getW() + 20;
|
||||||
int yLocation = buttonReturn.getY();
|
int yLocation = buttonReturn.getY();
|
||||||
for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin();
|
for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin();
|
||||||
iterMap != fileFTPProgressList.end(); ++iterMap) {
|
iterMap != fileFTPProgressList.end(); ++iterMap) {
|
||||||
|
@ -1894,10 +1898,12 @@ void MenuStateMods::render() {
|
||||||
|
|
||||||
renderer.renderProgressBar(
|
renderer.renderProgressBar(
|
||||||
iterMap->second.first,
|
iterMap->second.first,
|
||||||
10,
|
//10,
|
||||||
|
//yLocation,
|
||||||
|
xLocation,
|
||||||
yLocation,
|
yLocation,
|
||||||
CoreData::getInstance().getDisplayFontSmall(),
|
CoreData::getInstance().getDisplayFontSmall(),
|
||||||
350,progressLabelPrefix);
|
350,progressLabelPrefix,false);
|
||||||
|
|
||||||
yLocation -= 10;
|
yLocation -= 10;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user