Info popups are now hidden from both the screensaver and media viewer.

This commit is contained in:
Leon Styhre 2021-10-07 19:03:43 +02:00
parent 087cde4700
commit be6782d340

View file

@ -563,13 +563,13 @@ void Window::render()
startScreensaver(); startScreensaver();
} }
if (mInfoPopup)
mInfoPopup->render(trans);
// Always call the screensaver render function regardless of whether the screensaver is active // Always call the screensaver render function regardless of whether the screensaver is active
// or not because it may perform a fade on transition. // or not because it may perform a fade on transition.
renderScreensaver(); renderScreensaver();
if (!mRenderScreensaver && mInfoPopup)
mInfoPopup->render(trans);
if (mTimeSinceLastInput >= screensaverTimer && screensaverTimer != 0) { if (mTimeSinceLastInput >= screensaverTimer && screensaverTimer != 0) {
if (!isProcessing() && mAllowSleep && (!mScreensaver)) { if (!isProcessing() && mAllowSleep && (!mScreensaver)) {
// Go to sleep. // Go to sleep.
@ -724,7 +724,6 @@ void Window::startScreensaver()
for (auto it = mGuiStack.cbegin(); it != mGuiStack.cend(); it++) for (auto it = mGuiStack.cbegin(); it != mGuiStack.cend(); it++)
(*it)->onScreensaverActivate(); (*it)->onScreensaverActivate();
stopInfoPopup();
setAllowTextScrolling(false); setAllowTextScrolling(false);
mScreensaver->startScreensaver(true); mScreensaver->startScreensaver(true);
mRenderScreensaver = true; mRenderScreensaver = true;