fix legacyfont on intro and changed linux default legacy font to arial since helvetica is not working on ubuntu
This commit is contained in:
parent
284f4d0277
commit
9135b6155d
|
@ -43,17 +43,17 @@ FogOfWarSmoothing=true
|
||||||
FogOfWarSmoothingFrameSkip=3
|
FogOfWarSmoothingFrameSkip=3
|
||||||
FontConsoleBaseSize=18
|
FontConsoleBaseSize=18
|
||||||
FontConsolePostfix=-*-*-*-*-*-*-*
|
FontConsolePostfix=-*-*-*-*-*-*-*
|
||||||
FontConsolePrefix=-*-helvetica-*-r-*-*-
|
FontConsolePrefix=-*-arial-*-r-*-*-
|
||||||
FontDisplayBaseSize=12
|
FontDisplayBaseSize=12
|
||||||
FontDisplayPostfix=-*-*-*-*-*-*-*
|
FontDisplayPostfix=-*-*-*-*-*-*-*
|
||||||
FontDisplayPrefix=-*-helvetica-*-r-*-*-
|
FontDisplayPrefix=-*-arial-*-r-*-*-
|
||||||
FontDisplaySmallBaseSize=12
|
FontDisplaySmallBaseSize=12
|
||||||
FontMenuBigBaseSize=20
|
FontMenuBigBaseSize=20
|
||||||
FontMenuBigPostfix=-*-*-*-*-*-*-*
|
FontMenuBigPostfix=-*-*-*-*-*-*-*
|
||||||
FontMenuBigPrefix=-*-helvetica-*-r-*-*-
|
FontMenuBigPrefix=-*-arial-*-r-*-*-
|
||||||
FontMenuNormalBaseSize=14
|
FontMenuNormalBaseSize=14
|
||||||
FontMenuNormalPostfix=-*-*-*-*-*-*-*
|
FontMenuNormalPostfix=-*-*-*-*-*-*-*
|
||||||
FontMenuNormalPrefix=-*-helvetica-*-r-*-*-
|
FontMenuNormalPrefix=-*-arial-*-r-*-*-
|
||||||
FontMenuVeryBigBaseSize=25
|
FontMenuVeryBigBaseSize=25
|
||||||
FontSizeAdjustment=0
|
FontSizeAdjustment=0
|
||||||
Lang=english
|
Lang=english
|
||||||
|
|
|
@ -524,19 +524,17 @@ void Intro::render() {
|
||||||
if(renderX < 0) {
|
if(renderX < 0) {
|
||||||
const Metrics &metrics= Metrics::getInstance();
|
const Metrics &metrics= Metrics::getInstance();
|
||||||
int w= metrics.getVirtualW();
|
int w= metrics.getVirtualW();
|
||||||
//int h= metrics.getVirtualH();
|
renderX = (w / 2);
|
||||||
|
|
||||||
renderX = (w / 2) - (text->getFont()->getMetrics()->getTextWidth(text->getText()) / 2);
|
|
||||||
}
|
}
|
||||||
if(renderY < 0) {
|
if(renderY < 0) {
|
||||||
const Metrics &metrics= Metrics::getInstance();
|
const Metrics &metrics= Metrics::getInstance();
|
||||||
int h= metrics.getVirtualH();
|
int h= metrics.getVirtualH();
|
||||||
renderY = (h / 2) + (text->getFont()->getMetrics()->getHeight() / 2);
|
renderY = (h / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
renderer.renderText(
|
renderer.renderText(
|
||||||
text->getText(), text->getFont(), alpha,
|
text->getText(), text->getFont(), alpha,
|
||||||
renderX, renderY, false);
|
renderX, renderY, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user