diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index fb8412a1c..11bb728a5 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -890,23 +891,15 @@ void CMenuWidget::paint() calcSize(); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/); - // paint shadow - frameBuffer->paintBoxRel(x+SHADOW_OFFSET ,y + SHADOW_OFFSET ,width + sb_width ,height + RADIUS_LARGE ,COL_MENUCONTENTDARK_PLUS_0 ,RADIUS_LARGE); // paint head - frameBuffer->paintBoxRel(x ,y ,width + sb_width ,hheight ,COL_MENUHEAD_PLUS_0 ,RADIUS_LARGE, CORNER_TOP); - // paint background - frameBuffer->paintBoxRel(x ,y+hheight, width + sb_width, height-hheight + RADIUS_LARGE ,COL_MENUCONTENT_PLUS_0 ,RADIUS_LARGE, CORNER_BOTTOM); + CComponentsHeader header(x, y, width + sb_width, hheight, nameString, iconfile.c_str()); + header.setShadowOnOff(CC_SHADOW_ON); + header.paint(); - //paint menu head - int HeadiconOffset = 0; - if(!(iconfile.empty())){ - int w, h; - frameBuffer->getIconSize(iconfile.c_str(), &w, &h); - HeadiconOffset = w+6; - } - int fw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getWidth(); - g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+(fw/3)+HeadiconOffset,y+hheight+1, width-((fw/3)+HeadiconOffset), nameString.c_str(), COL_MENUHEAD, 0, true); // UTF-8 - frameBuffer->paintIcon(iconfile, x + fw/4, y, hheight); + // paint body shadow + frameBuffer->paintBoxRel(x+SHADOW_OFFSET, y + hheight + SHADOW_OFFSET, width + sb_width, height - hheight + RADIUS_LARGE, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); + // paint body background + frameBuffer->paintBoxRel(x ,y+hheight, width + sb_width, height-hheight + RADIUS_LARGE ,COL_MENUCONTENT_PLUS_0 ,RADIUS_LARGE, CORNER_BOTTOM); item_start_y = y+hheight; paintItems();