qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-18 01:40:39 +02:00
Code

Show the background while loading the menu

Browse Source 
This is better than showing an empty black screen, I think.
This commit is contained in:
Paul Cercueil 2014-04-29 00:22:04 +02:00
parent 5fa8919f2b
commit dac1e49238
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gmenu2x.cpp
View File

@ -226,7 +226,6 @@ GMenu2X::GMenu2X()
font = NULL; font = NULL;
setSkin(confStr["skin"], !fileExists(confStr["wallpaper"])); setSkin(confStr["skin"], !fileExists(confStr["wallpaper"]));
layers.insert(layers.begin(), make_shared<Background>(*this)); layers.insert(layers.begin(), make_shared<Background>(*this));
initMenu();
/* We enable video at a later stage, so that the menu elements are /* We enable video at a later stage, so that the menu elements are
* loaded before SDL inits the video; this is made so that we won't show * loaded before SDL inits the video; this is made so that we won't show
@ -238,10 +237,6 @@ GMenu2X::GMenu2X()
s = Surface::openOutputSurface(resX, resY, confInt["videoBpp"]); s = Surface::openOutputSurface(resX, resY, confInt["videoBpp"]);
#ifdef ENABLE_INOTIFY
monitor = new MediaMonitor(CARD_ROOT);
#endif
if (!fileExists(confStr["wallpaper"])) { if (!fileExists(confStr["wallpaper"])) {
DEBUG("No wallpaper defined; we will take the default one.\n"); DEBUG("No wallpaper defined; we will take the default one.\n");
confStr["wallpaper"] = DEFAULT_WALLPAPER_PATH; confStr["wallpaper"] = DEFAULT_WALLPAPER_PATH;
@ -249,6 +244,17 @@ GMenu2X::GMenu2X()
initBG(); initBG();
/* the menu may take a while to load, so we show the background here */
for (auto layer : layers)
layer->paint(*s);
s->flip();
initMenu();
#ifdef ENABLE_INOTIFY
monitor = new MediaMonitor(CARD_ROOT);
#endif
/* If a user-specified input.conf file exists, we load it; /* If a user-specified input.conf file exists, we load it;
* otherwise, we load the default one. */ * otherwise, we load the default one. */
string input_file = getHome() + "/input.conf"; string input_file = getHome() + "/input.conf";