Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

corrected font alingment when using combination of newline and tabs

This commit is contained in:
Mark Vejvoda 2011-11-28 15:59:38 +00:00
parent c16cdad134
commit 30972bcddb
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/glest_game/menu/menu_state_about.cpp
View File

@ -66,16 +66,16 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) :
}
else {
for(int i= 0; i < aboutStringCount1; ++i) {
labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i));
labelAbout1[i].init(100, 700 - i * 20);
labelAbout1[i].setText(getAboutString1(i));
}
labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i));
labelAbout1[i].init(100, 700 - i * 20);
labelAbout1[i].setText(getAboutString1(i));
}
for(int i= 0; i < aboutStringCount2; ++i) {
labelAbout2[i].registerGraphicComponent(containerName, "labelAbout2" + intToStr(i));
labelAbout2[i].init(100, 620 - i * 20);
labelAbout2[i].setText(getAboutString2(i));
}
for(int i= 0; i < aboutStringCount2; ++i) {
labelAbout2[i].registerGraphicComponent(containerName, "labelAbout2" + intToStr(i));
labelAbout2[i].init(100, 620 - i * 20);
labelAbout2[i].setText(getAboutString2(i));
}
}
for(int i= 0; i < teammateCount; ++i) {
@ -141,7 +141,9 @@ string MenuStateAbout::loadAdditionalCredits(){
endPathWithSlash(data_path);
}
string result= "";
const string dir= data_path + "data/core/menu/credits.txt";
const string dir= getGameCustomCoreDataPath(data_path,"data/core/menu/credits.txt");
//printf("dir [%s]\n",dir.c_str());
if(fileExists(dir) == true) {
#if defined(WIN32) && !defined(__MINGW32__)
FILE *fp = _wfopen(utf8_decode(dir).c_str(), L"r");

3
source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp
View File

@ -539,6 +539,7 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo
//glTranslatef(translatePos.x + scaleWidthX, translatePos.y, translatePos.z);
glTranslatef(translatePos.x, translatePos.y, translatePos.z);
Vec3f translatePosOriginal = translatePos;;
//assertGl();
//glScalef(scaleX, scaleY, scaleZ);
@ -611,7 +612,7 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo
//printf("Trying to render newline [%s] i = %d yLineValue = %f font->getTextHandler()->LineHeight(parts[i].c_str()) = %f\n",renderText.c_str(),i,yLineValue,font->getTextHandler()->LineHeight(parts[i].c_str()));
translatePos= Vec3f(translatePos.x, translatePos.y - yLineValue, translatePos.z);
translatePos= Vec3f(translatePosOriginal.x, translatePos.y - yLineValue, translatePos.z);
needsRecursiveRender = true;
}
break;