mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-24 21:45:31 +01:00
parent fb4695897b a85e6a2971
commit 1314c64817
6 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/widget/menue.cpp
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)
@@ -1409,17 +1411,18 @@ 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;
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(x /*-ConnectLineBox_Width*/, y, full_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(x /*-ConnectLineBox_Width*/, y, saveScreen_width, saveScreen_height, background);
}
}
@@ -1429,6 +1432,8 @@ void CMenuWidget::enableSaveScreen(bool enable)
if (!enable && background) {
delete[] background;
background = NULL;
saveScreen_width = 0;
saveScreen_height = 0;
}
}