From 85e3acf202a8248e8cc6341e9ad4a0c8b2782e8a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 14:26:22 +0200 Subject: [PATCH] menue: only add hint_height to full_height, if we really have a hint Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/58e05cfd9923e12bfde2587bd77d274aef1d2371 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - menue: only add hint_height to full_height, if we really have a hint ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index eb34d4d74..943541713 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1304,7 +1304,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 @@ -1424,20 +1427,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); } }