mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 19:01:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

screensaver: ensure clean paint of unscaled images

Browse Source
This commit is contained in:
Thilo Graf
2020-02-05 22:03:12 +01:00
parent b42bf6109b
commit 6bc3d7c109
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/screensaver.cpp
View File

@@ -347,7 +347,7 @@ void CScreenSaver::paint()
dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str()); dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str());
m_frameBuffer->showFrame(v_bg_files.at(index), CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_IMAGE); m_frameBuffer->showFrame(v_bg_files.at(index), CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED);
handleRadioText(g_settings.screensaver_mode_text); handleRadioText(g_settings.screensaver_mode_text);
@@ -386,6 +386,7 @@ void CScreenSaver::paint()
#endif #endif
m_frameBuffer->showFrame("blackscreen.jpg", CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_CALLBACK | CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_BLACKSCREEN); m_frameBuffer->showFrame("blackscreen.jpg", CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_CALLBACK | CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_BLACKSCREEN);
#endif #endif
handleRadioText(g_settings.screensaver_mode_text); handleRadioText(g_settings.screensaver_mode_text);
if (scr_clock) if (scr_clock)
@@ -445,12 +446,9 @@ void CScreenSaver::handleRadioText(bool enable_paint)
if (!g_RadiotextWin) if (!g_RadiotextWin)
return; return;
if (g_RadiotextWin->isPainted() || g_settings.screensaver_mode == SCR_MODE_IMAGE) g_RadiotextWin->clearSavedScreen();
{
g_RadiotextWin->hide(); if (g_settings.screensaver_mode != SCR_MODE_IMAGE)
g_RadiotextWin->clearSavedScreen();
}
else
g_RadiotextWin->kill(/*COL_BLACK*/); //ensure black paintBackground before repaint g_RadiotextWin->kill(/*COL_BLACK*/); //ensure black paintBackground before repaint
//check position and size, use only possible available screen size //check position and size, use only possible available screen size
@@ -471,6 +469,8 @@ void CScreenSaver::handleRadioText(bool enable_paint)
if (scr_clock) if (scr_clock)
scr_clock->cl_sl_show.unblock(); scr_clock->cl_sl_show.unblock();
} }
m_frameBuffer->OnFallbackShowFrame.connect(sigc::mem_fun(g_RadiotextWin, &CRadioTextGUI::hide));
} }
void CScreenSaver::hideRadioText() void CScreenSaver::hideRadioText()