gui/widget/stringinput_ext.cpp: fix size with hints, fix screen position

This commit is contained in:
[CST] Focus
2012-07-16 13:47:35 +04:00
parent 831d6f2a82
commit 96cb49b4fe

View File

@@ -116,13 +116,21 @@ void CExtendedInput::calculateDialog()
hintPosY = height -10;
if (hint_1 != NONEXISTANT_LOCALE)
if (hint_1 != NONEXISTANT_LOCALE) {
height += iheight;
if (hint_2 != NONEXISTANT_LOCALE)
int hw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_1), true);
if(width < hw + 40)
width = hw + 40;
}
if (hint_2 != NONEXISTANT_LOCALE) {
height += iheight;
int hw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_2), true);
if(width < hw)
width = hw;
}
x = ((frameBuffer->getScreenWidth() - width)>>1);
y = ((frameBuffer->getScreenHeight() - height)>>1);
x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - width)>>1);
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height)>>1);
hintPosY += y;
}