Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-02 23:39:21 +01:00
41 changed files with 345 additions and 205 deletions

View File

@@ -637,6 +637,8 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge
fbutton_width = 0;
fbutton_height = 0;
nextShortcut = 1;
saveScreen_width = 0;
saveScreen_height = 0;
}
void CMenuWidget::move(int xoff, int yoff)
@@ -1408,17 +1410,20 @@ void CMenuWidget::saveScreen()
return;
delete[] background;
background = new fb_pixel_t [full_width * (full_height+fbutton_height)];
saveScreen_height = full_height+fbutton_height;
saveScreen_width = full_width;
saveScreen_y = y;
saveScreen_x = x;
background = new fb_pixel_t [saveScreen_height * saveScreen_width];
if(background)
frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
frameBuffer->SaveScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
void CMenuWidget::restoreScreen()
{
if(background) {
if(savescreen)
frameBuffer->RestoreScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
frameBuffer->RestoreScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
}
@@ -1428,6 +1433,10 @@ void CMenuWidget::enableSaveScreen(bool enable)
if (!enable && background) {
delete[] background;
background = NULL;
saveScreen_width = 0;
saveScreen_height = 0;
saveScreen_y = 0;
saveScreen_x = 0;
}
}