mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
- menue: only add hint_height to full_height, if we really have a hint
This commit is contained in:
committed by
Jacek Jendrzej
parent
e94e0780b0
commit
58e05cfd99
@@ -1304,7 +1304,10 @@ void CMenuWidget::setMenuPos(const int& menu_width)
|
|||||||
int scr_y = frameBuffer->getScreenY();
|
int scr_y = frameBuffer->getScreenY();
|
||||||
int scr_w = frameBuffer->getScreenWidth();
|
int scr_w = frameBuffer->getScreenWidth();
|
||||||
int scr_h = frameBuffer->getScreenHeight();
|
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 x_old = x;
|
||||||
int y_old = y;
|
int y_old = y;
|
||||||
//configured positions
|
//configured positions
|
||||||
@@ -1424,20 +1427,23 @@ void CMenuWidget::saveScreen()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
delete[] background;
|
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_width = full_width;
|
||||||
saveScreen_y = y;
|
saveScreen_y = y;
|
||||||
saveScreen_x = x;
|
saveScreen_x = x;
|
||||||
background = new fb_pixel_t [saveScreen_height * saveScreen_width];
|
background = new fb_pixel_t [saveScreen_height * saveScreen_width];
|
||||||
if(background)
|
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()
|
void CMenuWidget::restoreScreen()
|
||||||
{
|
{
|
||||||
if(background) {
|
if(background) {
|
||||||
if(savescreen)
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user