- bugfix for popup menu in legacy font mode
This commit is contained in:
parent
555e88f464
commit
e8663b99bc
|
@ -706,7 +706,7 @@ void PopupMenu::init(string menuHeader,std::vector<string> menuItems) {
|
||||||
int maxButtonWidth = -1;
|
int maxButtonWidth = -1;
|
||||||
for(unsigned int i = 0; i < menuItems.size(); ++i) {
|
for(unsigned int i = 0; i < menuItems.size(); ++i) {
|
||||||
int currentButtonWidth = -1;
|
int currentButtonWidth = -1;
|
||||||
if(font3D != NULL) {
|
if(font3D != NULL && Font::forceLegacyFonts == false) {
|
||||||
FontMetrics *fontMetrics= font3D->getMetrics();
|
FontMetrics *fontMetrics= font3D->getMetrics();
|
||||||
if(fontMetrics) {
|
if(fontMetrics) {
|
||||||
currentButtonWidth = fontMetrics->getTextWidth(menuItems[i]);
|
currentButtonWidth = fontMetrics->getTextWidth(menuItems[i]);
|
||||||
|
|
|
@ -7000,10 +7000,16 @@ void Renderer::renderPopupMenu(PopupMenu *menu) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//text
|
//text
|
||||||
|
int renderX = (menu->getX() + (menu->getW() / 2));
|
||||||
|
//int renderY = (menu->getY() + (menu->getH() / 2));
|
||||||
|
FontMetrics *fontMetrics= menu->getFont()->getMetrics();
|
||||||
|
int renderY = menu->getY() + menu->getH() - fontMetrics->getHeight();
|
||||||
renderTextShadow(
|
renderTextShadow(
|
||||||
menu->getHeader(), menu->getFont(),fontColor,
|
menu->getHeader(), menu->getFont(),fontColor,
|
||||||
menu->getX()+15, menu->getY()+93*menu->getH()/100,
|
renderX, renderY,
|
||||||
true);
|
true);
|
||||||
|
|
||||||
|
//renderText(button->getText(), button->getFont(), color,x + (w / 2), y + (h / 2), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//buttons
|
//buttons
|
||||||
|
|
Loading…
Reference in New Issue