mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/widget/menue.cpp: paint body without head;

Browse Source 
disable menu name display on VFD - it overwritten by option name anyway;
little cleanup
This commit is contained in:
[CST] Focus
2012-07-18 16:01:48 +04:00
parent 7d213f1d15
commit 00f77bec3d
1 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/widget/menue.cpp
View File

@@ -378,20 +378,6 @@ void CMenuWidget::move(int xoff, int yoff)
CMenuWidget::~CMenuWidget() CMenuWidget::~CMenuWidget()
{ {
#if 0
for(unsigned int count=0;count<items.size();count++) {
CMenuItem * item = items[count];
if ((item != GenericMenuSeparator) &&
(item != GenericMenuSeparatorLine) &&
(item != GenericMenuBack) &&
(item != GenericMenuCancel)){
delete item;
}
}
items.clear();
page_start.clear();
#endif
resetWidget(true); resetWidget(true);
delete details_line; delete details_line;
} }
@@ -755,7 +741,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
void CMenuWidget::hide() void CMenuWidget::hide()
{ {
//frameBuffer->paintBackgroundBoxRel(x, y, width+15+SHADOW_OFFSET,height+10+SHADOW_OFFSET);
if(savescreen && background) if(savescreen && background)
restoreScreen();//FIXME restoreScreen();//FIXME
else { else {
@@ -875,27 +860,14 @@ void CMenuWidget::calcSize()
void CMenuWidget::paint() void CMenuWidget::paint()
{ {
calcSize(); calcSize();
#if 0 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/);
if(save)
saveScreen(); // paint shadow
#endif
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameString.c_str());
#if 0
//clear backround on corners switch
static bool corners = g_settings.rounded_corners;
if(g_settings.rounded_corners != corners){
corners = g_settings.rounded_corners;
if(!g_settings.rounded_corners){
frameBuffer->paintBackgroundBoxRel(x, y+full_height-hint_height, full_width, CORNER_RADIUS_LARGE-2+SHADOW_OFFSET);
}else{
frameBuffer->paintBackgroundBoxRel(x, y, full_width, CORNER_RADIUS_LARGE-2+SHADOW_OFFSET);
}
}
#endif
//paint shadow and backround
frameBuffer->paintBoxRel(x+SHADOW_OFFSET ,y + SHADOW_OFFSET ,width + sb_width ,height + RADIUS_LARGE ,COL_MENUCONTENTDARK_PLUS_0 ,RADIUS_LARGE); frameBuffer->paintBoxRel(x+SHADOW_OFFSET ,y + SHADOW_OFFSET ,width + sb_width ,height + RADIUS_LARGE ,COL_MENUCONTENTDARK_PLUS_0 ,RADIUS_LARGE);
frameBuffer->paintBoxRel(x ,y ,width + sb_width ,height + RADIUS_LARGE ,COL_MENUCONTENT_PLUS_0 ,RADIUS_LARGE); // paint head
frameBuffer->paintBoxRel(x ,y ,width + sb_width ,hheight ,COL_MENUHEAD_PLUS_0 ,RADIUS_LARGE, CORNER_TOP); 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);
//paint menu head //paint menu head
int HeadiconOffset = 0; int HeadiconOffset = 0;
@@ -1048,10 +1020,6 @@ void CMenuWidget::restoreScreen()
if(background) { if(background) {
if(savescreen) if(savescreen)
frameBuffer->RestoreScreen(x-ConnectLineBox_Width, y, full_width, full_height, background); frameBuffer->RestoreScreen(x-ConnectLineBox_Width, y, full_width, full_height, background);
#if 0
delete[] background;
background = NULL;
#endif
} }
} }