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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-27 14:30:28 +02:00
parent 1fc8437a34 58e05cfd99
commit 7ae7765460
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1303,7 +1303,10 @@ void CMenuWidget::setMenuPos(const int& menu_width)
int scr_y = frameBuffer->getScreenY();
int scr_w = frameBuffer->getScreenWidth();
int scr_h = frameBuffer->getScreenHeight();
int real_h = full_height + OFFSET_INTER + hint_height + OFFSET_SHADOW; // full_height includes footer_height : see calcSize
int hint_h = 0;
if (hint_height)
hint_h = OFFSET_INTER + hint_height + OFFSET_SHADOW;
int real_h = full_height + hint_h; // full_height includes footer_height : see calcSize
int x_old = x;
int y_old = y;
//configured positions
@@ -1423,20 +1426,23 @@ void CMenuWidget::saveScreen()
return;
delete[] background;
saveScreen_height = full_height + OFFSET_INTER + hint_height + OFFSET_SHADOW; // full_height includes footer_height : see calcSize
int hint_h = 0;
if (hint_height)
hint_h = OFFSET_INTER + hint_height + OFFSET_SHADOW;
saveScreen_height = full_height + hint_h; // full_height includes footer_height : see calcSize
saveScreen_width = full_width;
saveScreen_y = y;
saveScreen_x = x;
background = new fb_pixel_t [saveScreen_height * saveScreen_width];
if(background)
frameBuffer->SaveScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
frameBuffer->SaveScreen(saveScreen_x, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
void CMenuWidget::restoreScreen()
{
if(background) {
if(savescreen)
frameBuffer->RestoreScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
frameBuffer->RestoreScreen(saveScreen_x, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
}